← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/dataset-data-form-edit.twig

  • Committer: Dan Garner
  • Date: 2016-02-01 11:09:24 UTC
  • mfrom: (454.4.85)
  • Revision ID: git-v1:c2a7712fa4fd339a76780537fc77492c50667b9d
Merge pull request #135 from dasgarner/develop

Fixes for alpha3

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/dataset-data-form-edit.twig
41
41
                            { name: "data-live-search", value: "true" },
42
42
                            { name: "data-selected-text-format", value: "count > 4" }
43
43
                            ] %}
44
 
                            {{ forms.dropdown(fieldId, "single", col.heading, heading, images, "mediaId", "name", "", "", "", "", "", attributes) }}
 
44
                            {{ forms.dropdown(fieldId, "single", col.heading, heading, [{mediaId: 0, name: ""}]|merge(images), "mediaId", "name", "", "", "", "", "", attributes) }}
 
45
                        {% elseif col.listContent != "" %}
 
46
                            {{ forms.dropdown(fieldId, "single", col.heading, heading, [""]|merge(col.listContentArray())) }}
45
47
                        {% else %}
46
48
                            {{ forms.input(fieldId, col.heading, heading) }}
47
49
                        {% endif %}