diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 36510e22..86848fb5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -161,7 +161,7 @@ module ApplicationHelper end # show a user, depending on settings - def show_user(user=@current_user, options = {})#full: false, markup: false, unique: false) + def show_user(user=@current_user, options = {}) if user.nil? "?" elsif FoodsoftConfig[:use_nick] diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb index c123c9ae..f2a9bea5 100644 --- a/app/helpers/tasks_helper.rb +++ b/app/helpers/tasks_helper.rb @@ -2,7 +2,7 @@ module TasksHelper def task_assignments(task) task.assignments.map do |ass| - content_tag :span, ass.user.nick, :class => (ass.accepted? ? 'accepted' : 'unaccepted') + content_tag :span, show_user(ass.user), :class => (ass.accepted? ? 'accepted' : 'unaccepted') end.join(", ").html_safe end diff --git a/app/models/group.rb b/app/models/group.rb index 092c0119..9c861abd 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -17,7 +17,7 @@ class Group < ActiveRecord::Base # Returns all NONmembers and a checks for possible multiple Ordergroup-Memberships def non_members - User.all(:order => 'nick').reject { |u| users.include?(u) } + User.natural_order.all.reject { |u| users.include?(u) } end def user_tokens=(ids) diff --git a/app/views/shared/_auto_complete_users.rhtml b/app/views/shared/_auto_complete_users.rhtml index 18c0d3c9..8a3a6ed4 100644 --- a/app/views/shared/_auto_complete_users.rhtml +++ b/app/views/shared/_auto_complete_users.rhtml @@ -1,5 +1,5 @@