Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #1418 - with the help of @natseg - Pull request #1437.

Browse source
This commit is contained in:
Thorsten Eckel 2017-10-17 10:33:27 +02:00
parent bb057277ff
commit 0632e421b0
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee
View file

@ -160,13 +160,15 @@ class App.UiElement.ApplicationUiElement
nameNew = item.displayName() nameNew = item.displayName()
else if item.name else if item.name
nameNew = item.name nameNew = item.name
if attribute.translate if attribute.translate
nameNew = App.i18n.translateInline(nameNew) nameNew = App.i18n.translateInline(nameNew)
attribute.options.push {
name: nameNew, attribute.options.push
value: item.id, value: item.id,
note: item.note, note: item.note,
} name: nameNew,
title: if item.email then item.email else nameNew
attribute.sortBy = null attribute.sortBy = null

2
app/assets/javascripts/app/views/generic/column_select.jst.eco
View file

@ -29,7 +29,7 @@
<% end %> <% end %>
<div class="columnSelect-pool js-pool"> <div class="columnSelect-pool js-pool">
<% for option in @attribute.options: %> <% for option in @attribute.options: %>
<div class="columnSelect-option js-select js-option<%= ' is-hidden' if option.selected %>" data-value="<%= option.value %>" title="<%= option.name %>"><%= option.name %></div> <div class="columnSelect-option js-select js-option<%= ' is-hidden' if option.selected %>" data-value="<%= option.value %>" title="<%= option.title %>"><%= option.name %></div>
<% end %> <% end %>
</div> </div>
</div> </div>