Merge pull request #558 from warpc/527-member_username_fix

[issue #527] Change view of group members list
This commit is contained in:
Vladimir Sharshov 2012-07-04 08:58:33 -07:00
commit ff03bc58e4
2 changed files with 2 additions and 2 deletions

View File

@ -73,7 +73,7 @@ class User < ActiveRecord::Base
end
def fullname
return "#{uname} (#{name})"
return name.present? && name.length > 0 ? "#{uname} (#{name})" : uname
end
def user_appeal

View File

@ -15,7 +15,7 @@
%span#niceCheckbox1.niceCheck-main= check_box_tag "user_remove[#{user.id}][]"
%td
.img= image_tag avatar_url(user)
.forimg= link_to user.name, user_path(user)
.forimg= link_to user.fullname, user_path(user)
- Relation::ROLES.each_with_index do |role, i|
%td
.radio= radio_button_tag "user[#{user.id}]", role, ((parent.actors.exists? :actor_id => user.id, :actor_type => 'User', :role => role) ? :checked : nil), :class => 'niceRadio'