Skip to content
This repository was archived by the owner on Apr 5, 2018. It is now read-only.

elementvars is optional for users when no group is selected, line-breaks break csv files. #46

Open
roelvanhintum wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

elementvars is optional for users when no group is selected, line-breaks break csv files. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
489e13b
elementvars is optional for users when no group is selected.
Sep 21, 2017
b7c982d
Make sure to remove line-breaks from text fields.
Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions services/ExportService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ public function parseFieldData($handle, $data)
case ExportModel::FieldTypeDropdown:
// Resolve to string
$data = (string) $data;
$data = preg_replace('/\r|\n/', '', $data);
break;

case ExportModel::FieldTypeCheckboxes:
Expand Down
4 changes: 3 additions & 1 deletion services/Export_UserService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ public function setCriteria(array $settings)
$criteria->status = isset($settings['map']['status']) ? $settings['map']['status'] : null;

// Get by group
$criteria->groupId = $settings['elementvars']['groups'];
if (isset($settings['elementvars']) && isset($settings['elementvars']['groups'])) {
$criteria->groupId = $settings['elementvars']['groups'];
}

return $criteria;
}
Expand Down
99 changes: 51 additions & 48 deletions templates/_map.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,62 @@
<input type="hidden" name="export[{{ key }}]" value="{{ value }}">
{% endfor %}

{% for key, value in export.elementvars %}
{% if value is iterable %}
{% for subvalue in value %}
<input type="hidden" name="export[elementvars][{{ key }}][]" value="{{ subvalue }}">
{% endfor %}
{% else %}
<input type="hidden" name="export[elementvars][{{ key }}]" value="{{ value }}">
{% endif %}
{% endfor %}
{% if export.elementvars is defined %}
{% for key, value in export.elementvars %}
{% if value is iterable %}
{% for subvalue in value %}
<input type="hidden" name="export[elementvars][{{ key }}][]" value="{{ subvalue }}">
{% endfor %}
{% else %}
<input type="hidden" name="export[elementvars][{{ key }}]" value="{{ value }}">
{% endif %}
{% endfor %}
{% endif %}

<p>{{ "Choose which fields you want to export."|t }}</p>

<table class="data sortable">
<tbody>
{% set fields = craft.export.getFields(export.type, reset) %}
{% for handle, data in fields %}
{% if data.fieldtype is defined %}
{% set customTableRow = craft.export.customTableRow(data.fieldtype) %}
{% else %}
{% set customTableRow = false %}
{% endif %}
{% if customTableRow %}
{% include customTableRow ignore missing %}
{% else %}
<tr>
<td>
<div class="field">
<div class="heading">
<label>{{ data.name }}</label>
<input type="hidden" name="fields[{{ handle }}][name]" value="{{ data.name }}">
{% if data.entrytype is defined %}<input type="hidden" name="fields[{{ handle }}][entrytype]" value="{{ data.entrytype }}">{% endif %}
</div>
</div>
</td>
<td>
<div class="field">
<div class="heading">
<label>{{ "as"|t }}</label>
<input type="text" class="text" name="fields[{{ handle }}][label]" value="{{ data.label is defined ? data.label : data.name }}">
</div>
</div>
</td>
<td>
{{ forms.checkboxField({
label: 'Include in export'|t,
instructions: "This value will be included in the export file."|t,
name: "fields[" ~ handle ~ "][checked]",
checked: data.checked
}) }}
</td>
</tr>
{% endif %}
{% endfor %}
{% set fields = craft.export.getFields(export.type, reset) %}
{% for handle, data in fields %}
{% if data.fieldtype is defined %}
{% set customTableRow = craft.export.customTableRow(data.fieldtype) %}
{% else %}
{% set customTableRow = false %}
{% endif %}

{% if customTableRow %}
{% include customTableRow ignore missing %}
{% else %}
<tr>
<td>
<div class="field">
<div class="heading">
<label>{{ data.name }}</label>
<input type="hidden" name="fields[{{ handle }}][name]" value="{{ data.name }}">
{% if data.entrytype is defined %}<input type="hidden" name="fields[{{ handle }}][entrytype]" value="{{ data.entrytype }}">{% endif %}
</div>
</div>
</td>
<td>
<div class="field">
<div class="heading">
<label>{{ "as"|t }}</label>
<input type="text" class="text" name="fields[{{ handle }}][label]" value="{{ data.label is defined ? data.label : data.name }}">
</div>
</div>
</td>
<td>
{{ forms.checkboxField({
label: 'Include in export'|t,
instructions: "This value will be included in the export file."|t,
name: "fields[" ~ handle ~ "][checked]",
checked: data.checked
}) }}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
<tfoot>
<tr>
Expand Down