From f6c2fd9a9d6d47672d741ee99e6c32a744f73f1f Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Sun, 22 Sep 2013 02:15:35 +0200
Subject: [PATCH] more user display changes

---
 app/helpers/application_helper.rb           | 2 +-
 app/helpers/tasks_helper.rb                 | 2 +-
 app/models/group.rb                         | 2 +-
 app/views/shared/_auto_complete_users.rhtml | 4 ++--
 app/views/shared/_workgroup_members.haml    | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

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 @@
 <ul class="autocomplete">
 <% for user in @users do -%>
-  <li><span class="nick"><%=h user.nick %></span><span class="informal"> (<%= user.ordergroup.name.to_s if user.ordergroup %>)</span></li>
+  <li><span class="nick"><%= show_user(user) %></span><span class="informal"> (<%= user.ordergroup.try(:name) %>)</span></li>
 <% end -%>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/app/views/shared/_workgroup_members.haml b/app/views/shared/_workgroup_members.haml
index 960113d8..ac8fabd3 100644
--- a/app/views/shared/_workgroup_members.haml
+++ b/app/views/shared/_workgroup_members.haml
@@ -8,7 +8,8 @@
         %div{id: "collapse#{workgroup.id}", class: 'accordion-body collapse'}
           .accordion-inner
             %ul.unstyled
-              - workgroup.users.includes(:groups).order('nick').each do |user|
+              - workgroup.users.includes(:groups).natural_order.each do |user|
                 %li
-                  = user.nick
+                  = show_user(user)
                   %small (#{user.ordergroup.try(:name)})
+