Mercurial > hg > soundsoftware-site
changeset 590:3ebf9b76e57f cannam
Merge from bug_213
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 12 Aug 2011 14:52:07 +0100 |
| parents | 91389d8bbdea (current diff) b8549c67f9a7 (diff) |
| children | f12948591050 251b380117ce eaec823e6e23 de8f268e7f12 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/members/_list.rhtml Fri Aug 12 14:40:44 2011 +0100 +++ b/app/views/members/_list.rhtml Fri Aug 12 14:52:07 2011 +0100 @@ -10,7 +10,7 @@ <dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>"> <%= avatar(member.user, :size => "24") %> <span class="user"><%= link_to_user member.principal %></span> -<span class="email"><%= member.user.mail %></span> +<span class="email"><%= member.user.mail if !member.user.pref.hide_mail %></span> <dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>"> <span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span> </dd>