Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order

Conflicts:
	app/views/shared/_open_orders.html.haml

app/views/shared/_comments.haml

@@ -1,5 +1,5 @@
 - comments.each do |comment|
   .comment[comment]
     %strong= comment.user.try(:ordergroup_name)
-    %small (#{comment.user.try(:nick)} am #{format_time(comment.created_at)}):
+    %small (#{show_user comment.user} am #{format_time(comment.created_at)}):
     = simple_format(comment.text)

app/views/shared/_group.html.haml

@@ -12,7 +12,7 @@
   %dd
     - members = group.users
     = "(#{members.size})"
-    = members.collect(&:nick).join(", ")
+    = members.collect{|u| show_user(u)}.join(", ")
   - unless group.is_a?(Workgroup)
     %dt= t '.apple_limit'
     %dd= group.ignore_apple_restriction ? t('.deactivated') : t('.activated')

app/views/shared/_group_form_fields.html.haml

@@ -4,7 +4,7 @@
 = yield
 
 = f.input :user_tokens, :as => :string,
-  :input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json }
+  :input_html => { 'data-pre' => f.object.users.map(&:token_attributes).to_json }
 
 - content_for :javascript do
   :javascript

app/views/shared/_open_orders.html.haml

@@ -19,7 +19,7 @@
             %td= format_time(order.ends) unless order.ends.nil?
             - if group_order = order.group_order(ordergroup)
               - total += group_order.price
-              %td= "#{group_order.updated_by.nick} (#{format_time(group_order.updated_on)})"
+              %td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})"
               %td.numeric
                 = link_to_ordering(order, show: true) do
                   - number_to_currency(group_order.price)

app/views/shared/_user_form_fields.html.haml

@@ -1,4 +1,6 @@
-= f.input :nick
+- if FoodsoftConfig[:use_nick]
+  -# use_nil option to user model validators break required mark
+  = f.input :nick, required: true
 = f.input :first_name
 = f.input :last_name
 = f.input :email
@@ -19,7 +21,8 @@
             = t 'simple_form.labels.settings.settings_group.privacy'
         = profile.input 'phone_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] }
         = profile.input 'email_is_public',  as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] }
-        = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
+        - if FoodsoftConfig[:use_nick]
+          = profile.input 'name_is_public',   as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
   
     .settings-group
       %div{class: 'control-group'}

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)})
+