fallback for when nick is nil
This commit is contained in:
parent
e968919cce
commit
9ba425aafa
6 changed files with 12 additions and 6 deletions
|
|
@ -15,7 +15,7 @@
|
|||
%th= t '.created_at'
|
||||
- for user in @users
|
||||
%tr{:class => cycle('even','odd', :name => 'users')}
|
||||
%td= link_to show_user(user, full: true), [:admin, user]
|
||||
%td= link_to show_user(user), [:admin, user]
|
||||
- if FoodsoftConfig[:use_nick]
|
||||
%td= link_to user.name
|
||||
%td= format_date(user.created_on)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
%tbody
|
||||
- for user in @users
|
||||
%tr
|
||||
%td= link_to show_user(user, full: true), [:admin, user]
|
||||
%td= link_to show_user(user), [:admin, user]
|
||||
- if FoodsoftConfig[:use_nick]
|
||||
%td= user.name
|
||||
%td= user.email
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
- for user in @users
|
||||
%tr
|
||||
- if FoodsoftConfig[:use_nick]
|
||||
%td= user.nick
|
||||
%td= show_user user
|
||||
%td= user.name if @current_user.role_admin? || user.settings.profile["name_is_public"] || !FoodsoftConfig[:use_nick]
|
||||
%td= user.email if @current_user.role_admin? || user.settings.profile["email_is_public"]
|
||||
%td= user.phone if @current_user.role_admin? || user.settings.profile["phone_is_public"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue