|
|
|
@ -345,7 +345,11 @@ module ApplicationHelper
|
|
|
|
|
|
|
|
|
|
def link_to_isuue_user(user, options={})
|
|
|
|
|
if user.is_a?(User)
|
|
|
|
|
name = h(user.name(options[:format]))
|
|
|
|
|
if options[:format]
|
|
|
|
|
name = h(user.name(options[:format]))
|
|
|
|
|
else
|
|
|
|
|
name = h(user.show_name)
|
|
|
|
|
end
|
|
|
|
|
link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
|
|
|
|
|
else
|
|
|
|
|
h(user.to_s)
|
|
|
|
@ -978,7 +982,7 @@ module ApplicationHelper
|
|
|
|
|
groups = ''
|
|
|
|
|
collection.sort.each do |element|
|
|
|
|
|
selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
|
|
|
|
|
(element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
|
|
|
|
|
(element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.show_name}</option>)
|
|
|
|
|
end
|
|
|
|
|
unless groups.empty?
|
|
|
|
|
s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
|
|
|
|
|