##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed bad html generated in users/memberships partial (multiple </tbody> tags)...
Jean-Baptiste Barth -
r4394:f9f1bd58d6a6
parent child
Show More
Side by Side Unified
Context file:
r4394:f9f1bd58d6a6 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,62 +1,62
1 <% roles = Role.find_all_givable %>
1 <% roles = Role.find_all_givable %>
2 <% projects = Project.active.find(:all, :order => 'lft') %>
2 <% projects = Project.active.find(:all, :order => 'lft') %>
3
3
4 <div class="splitcontentleft">
4 <div class="splitcontentleft">
5 <% if @user.memberships.any? %>
5 <% if @user.memberships.any? %>
6 <table class="list memberships">
6 <table class="list memberships">
7 <thead><tr>
7 <thead><tr>
8 <th><%= l(:label_project) %></th>
8 <th><%= l(:label_project) %></th>
9 <th><%= l(:label_role_plural) %></th>
9 <th><%= l(:label_role_plural) %></th>
10 <th style="width:15%"></th>
10 <th style="width:15%"></th>
11 <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
11 <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
12 </tr></thead>
12 </tr></thead>
13 <tbody>
13 <tbody>
14 <% @user.memberships.each do |membership| %>
14 <% @user.memberships.each do |membership| %>
15 <% next if membership.new_record? %>
15 <% next if membership.new_record? %>
16 <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
16 <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
17 <td class="project">
17 <td class="project">
18 <%= link_to_project membership.project %>
18 <%= link_to_project membership.project %>
19 </td>
19 </td>
20 <td class="roles">
20 <td class="roles">
21 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
21 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
22 <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
22 <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
23 :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
23 :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
24 <p><% roles.each do |role| %>
24 <p><% roles.each do |role| %>
25 <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
25 <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
26 :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
26 :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
27 <% end %></p>
27 <% end %></p>
28 <%= hidden_field_tag 'membership[role_ids][]', '' %>
28 <%= hidden_field_tag 'membership[role_ids][]', '' %>
29 <p><%= submit_tag l(:button_change) %>
29 <p><%= submit_tag l(:button_change) %>
30 <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
30 <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
31 <% end %>
31 <% end %>
32 </td>
32 </td>
33 <td class="buttons">
33 <td class="buttons">
34 <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
34 <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
35 <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
35 <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
36 :method => :post },
36 :method => :post },
37 :class => 'icon icon-del') if membership.deletable? %>
37 :class => 'icon icon-del') if membership.deletable? %>
38 </td>
38 </td>
39 <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
39 <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
40 </tr>
40 </tr>
41 <% end; reset_cycle %>
41 </tbody>
42 </tbody>
42 <% end; reset_cycle %>
43 </table>
43 </table>
44 <% else %>
44 <% else %>
45 <p class="nodata"><%= l(:label_no_data) %></p>
45 <p class="nodata"><%= l(:label_no_data) %></p>
46 <% end %>
46 <% end %>
47 </div>
47 </div>
48
48
49 <div class="splitcontentright">
49 <div class="splitcontentright">
50 <% if projects.any? %>
50 <% if projects.any? %>
51 <fieldset><legend><%=l(:label_project_new)%></legend>
51 <fieldset><legend><%=l(:label_project_new)%></legend>
52 <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
52 <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
53 <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
53 <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
54 <p><%= l(:label_role_plural) %>:
54 <p><%= l(:label_role_plural) %>:
55 <% roles.each do |role| %>
55 <% roles.each do |role| %>
56 <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
56 <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
57 <% end %></p>
57 <% end %></p>
58 <p><%= submit_tag l(:button_add) %></p>
58 <p><%= submit_tag l(:button_add) %></p>
59 <% end %>
59 <% end %>
60 </fieldset>
60 </fieldset>
61 <% end %>
61 <% end %>
62 </div>
62 </div>
General Comments 0
You need to be logged in to leave comments. Login now