start of making nickname optional
This commit is contained in:
parent
a77c3b59b1
commit
e4f0a1e3ed
33 changed files with 92 additions and 48 deletions
|
|
@ -57,7 +57,7 @@
|
|||
- for ft in current_user.ordergroup.financial_transactions.limit(5).order('created_on DESC')
|
||||
%tr
|
||||
%td= format_time(ft.created_on)
|
||||
%td= h(ft.user.nil? ? '?' : ft.user.nick)
|
||||
%td= h(show_user(ft.user))
|
||||
%td= h(ft.note)
|
||||
- color = ft.amount < 0 ? 'red' : 'black'
|
||||
%td{:style => "color:#{color}; width:5em", :class => "currency"}= number_to_currency(ft.amount)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
%h2= t '.people'
|
||||
%ul
|
||||
- for membership in @ordergroup.memberships
|
||||
%li= membership.user.nick
|
||||
%li= show_user membership.user
|
||||
= link_to t('.invite'), new_invite_path(:id => @ordergroup), :remote => true, class: 'btn btn-primary'
|
||||
.span8
|
||||
%h2= t('.account_summary')
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
.row-fluid
|
||||
.span7
|
||||
%h3
|
||||
= h(t('.user.title', user: @current_user.nick))
|
||||
= h(t('.user.title', user: show_user))
|
||||
%small= t '.user.since', when: distance_of_time_in_words(Time.now, @current_user.created_on)
|
||||
= simple_form_for(@current_user, :url => { :action => 'update_profile'}) do |f|
|
||||
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue