Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

start of making nickname optional

Browse source
This commit is contained in:
wvengen 2013-09-20 22:40:13 +02:00
parent a77c3b59b1
commit e4f0a1e3ed
33 changed files with 92 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/foodcoop/ordergroups/_ordergroups.html.haml
View file

@ -13,7 +13,7 @@
- for ordergroup in @ordergroups
%tr
%td= ordergroup.name
%td=h ordergroup.users.collect { |u| u.nick }.join(", ")
%td=h ordergroup.users.collect { |u| show_user(u) }.join(", ")
%td= format_date ordergroup.orders.order('orders.starts DESC').first.try(:starts)
%td= link_to_new_message(message_params: {group_id: ordergroup.id})

6
app/views/foodcoop/users/_users.html.haml
View file

@ -4,7 +4,8 @@
%table.table.table-striped
%thead
%tr
%th= t 'simple_form.labels.user.nick'
- if FoodsoftConfig[:use_nick]
%th= t 'simple_form.labels.user.nick'
%th= t 'simple_form.labels.user.name'
%th= t 'simple_form.labels.user.email'
%th= t 'simple_form.labels.user.phone'
@ -13,7 +14,8 @@
%tbody
- for user in @users
%tr
%td= user.nick
- if FoodsoftConfig[:use_nick]
%td= user.nick
%td= user.name if @current_user.role_admin? || user.settings.profile["name_is_public"]
%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"]