##// END OF EJS Templates
remove unneeded h() from app/views/projects/settings/_members.html.erb...
Toshi MARUYAMA -
r11868:3acefa892342
parent child
Show More
@@ -1,75 +1,75
1 <%= error_messages_for 'member' %>
1 <%= error_messages_for 'member' %>
2 <% roles = Role.find_all_givable
2 <% roles = Role.find_all_givable
3 members = @project.member_principals.includes(:member_roles, :roles, :principal).all.sort %>
3 members = @project.member_principals.includes(:member_roles, :roles, :principal).all.sort %>
4
4
5 <div class="splitcontentleft">
5 <div class="splitcontentleft">
6 <% if members.any? %>
6 <% if members.any? %>
7 <table class="list members">
7 <table class="list members">
8 <thead><tr>
8 <thead><tr>
9 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
9 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
10 <th><%= l(:label_role_plural) %></th>
10 <th><%= l(:label_role_plural) %></th>
11 <th style="width:15%"></th>
11 <th style="width:15%"></th>
12 <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
12 <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
13 </tr></thead>
13 </tr></thead>
14 <tbody>
14 <tbody>
15 <% members.each do |member| %>
15 <% members.each do |member| %>
16 <% next if member.new_record? %>
16 <% next if member.new_record? %>
17 <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
17 <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
18 <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
18 <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
19 <td class="roles">
19 <td class="roles">
20 <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
20 <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
21 <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
21 <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
22 :method => :put,
22 :method => :put,
23 :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
23 :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
24 ) do |f| %>
24 ) do |f| %>
25 <p><% roles.each do |role| %>
25 <p><% roles.each do |role| %>
26 <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
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?} %> <%=h role %></label><br />
27 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%= role %></label><br />
28 <% end %></p>
28 <% end %></p>
29 <%= hidden_field_tag 'membership[role_ids][]', '' %>
29 <%= hidden_field_tag 'membership[role_ids][]', '' %>
30 <p><%= submit_tag l(:button_save), :class => "small" %>
30 <p><%= submit_tag l(:button_save), :class => "small" %>
31 <%= link_to_function l(:button_cancel),
31 <%= link_to_function l(:button_cancel),
32 "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
32 "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
33 %></p>
33 %></p>
34 <% end %>
34 <% end %>
35 </td>
35 </td>
36 <td class="buttons">
36 <td class="buttons">
37 <%= link_to_function l(:button_edit),
37 <%= link_to_function l(:button_edit),
38 "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
38 "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
39 :class => 'icon icon-edit' %>
39 :class => 'icon icon-edit' %>
40 <%= delete_link membership_path(member),
40 <%= delete_link membership_path(member),
41 :remote => true,
41 :remote => true,
42 :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
42 :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
43 </td>
43 </td>
44 <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
44 <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
45 </tr>
45 </tr>
46 <% end; reset_cycle %>
46 <% end; reset_cycle %>
47 </tbody>
47 </tbody>
48 </table>
48 </table>
49 <% else %>
49 <% else %>
50 <p class="nodata"><%= l(:label_no_data) %></p>
50 <p class="nodata"><%= l(:label_no_data) %></p>
51 <% end %>
51 <% end %>
52 </div>
52 </div>
53
53
54 <div class="splitcontentright">
54 <div class="splitcontentright">
55 <% if roles.any? %>
55 <% if roles.any? %>
56 <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
56 <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
57 <fieldset><legend><%=l(:label_member_new)%></legend>
57 <fieldset><legend><%=l(:label_member_new)%></legend>
58
58
59 <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
59 <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
60 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
60 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
61
61
62 <div id="principals_for_new_member">
62 <div id="principals_for_new_member">
63 <%= render_principals_for_new_members(@project) %>
63 <%= render_principals_for_new_members(@project) %>
64 </div>
64 </div>
65
65
66 <p><%= l(:label_role_plural) %>:
66 <p><%= l(:label_role_plural) %>:
67 <% roles.each do |role| %>
67 <% roles.each do |role| %>
68 <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
68 <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= role %></label>
69 <% end %></p>
69 <% end %></p>
70
70
71 <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
71 <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
72 </fieldset>
72 </fieldset>
73 <% end %>
73 <% end %>
74 <% end %>
74 <% end %>
75 </div>
75 </div>
General Comments 0
You need to be logged in to leave comments. Login now