From 0632e421b0168485082738ae356dbebc428742b2 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 17 Oct 2017 10:33:27 +0200 Subject: [PATCH] Fixed issue #1418 - with the help of @natseg - Pull request #1437. --- .../_ui_element/_application_ui_element.coffee | 8 +++++--- .../javascripts/app/views/generic/column_select.jst.eco | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee index 97dc48f3c..18b220889 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee @@ -160,13 +160,15 @@ class App.UiElement.ApplicationUiElement nameNew = item.displayName() else if item.name nameNew = item.name + if attribute.translate nameNew = App.i18n.translateInline(nameNew) - attribute.options.push { - name: nameNew, + + attribute.options.push value: item.id, note: item.note, - } + name: nameNew, + title: if item.email then item.email else nameNew attribute.sortBy = null diff --git a/app/assets/javascripts/app/views/generic/column_select.jst.eco b/app/assets/javascripts/app/views/generic/column_select.jst.eco index c56cbc45d..301dd0415 100644 --- a/app/assets/javascripts/app/views/generic/column_select.jst.eco +++ b/app/assets/javascripts/app/views/generic/column_select.jst.eco @@ -29,7 +29,7 @@ <% end %>
<% for option in @attribute.options: %> -
<%= option.name %>
+
<%= option.name %>
<% end %>
\ No newline at end of file