@@ -17,14 +17,14 | |||
|
17 | 17 | <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member"> |
|
18 | 18 | <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td> |
|
19 | 19 | <td class="roles"> |
|
20 |
<span id="member-<%= member.id %>-roles"><%= |
|
|
20 | <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span> | |
|
21 | 21 | <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), |
|
22 | 22 | :method => :put, |
|
23 | 23 | :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }} |
|
24 | 24 | ) do |f| %> |
|
25 | 25 | <p><% roles.each do |role| %> |
|
26 | 26 | <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), |
|
27 |
:disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%= |
|
|
27 | :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%= role %></label><br /> | |
|
28 | 28 | <% end %></p> |
|
29 | 29 | <%= hidden_field_tag 'membership[role_ids][]', '' %> |
|
30 | 30 | <p><%= submit_tag l(:button_save), :class => "small" %> |
@@ -65,7 +65,7 | |||
|
65 | 65 | |
|
66 | 66 | <p><%= l(:label_role_plural) %>: |
|
67 | 67 | <% roles.each do |role| %> |
|
68 |
<label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= |
|
|
68 | <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= role %></label> | |
|
69 | 69 | <% end %></p> |
|
70 | 70 | |
|
71 | 71 | <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p> |
General Comments 0
You need to be logged in to leave comments.
Login now