##// END OF EJS Templates
jro_apps » redmine
RSS
Sort user memberships by project....
Jean-Philippe Lang -
r15768:3c005719aeeb
parent child
Show More
Side by Side Unified
Context file:
r15768:3c005719aeeb Loading diff...:
Show file before | Show file after | Hide comments
@@ -37,6 +37,10 class Member < ActiveRecord::Base
37 reorder("#{Role.table_name}.position").
37 reorder("#{Role.table_name}.position").
38 order(Principal.fields_for_order_statement)
38 order(Principal.fields_for_order_statement)
39 }
39 }
40 scope :sorted_by_project, lambda {
41 includes(:project).
42 reorder("#{Project.table_name}.lft")
43 }
40
44
41 alias :base_reload :reload
45 alias :base_reload :reload
42 def reload(*args)
46 def reload(*args)
Show file before | Show file after | Hide comments
@@ -1,6 +1,8
1 <% memberships = principal.memberships.preload(:member_roles => :role).sorted_by_project.to_a %>
2
1 <p><%= link_to l(:label_add_projects), new_principal_membership_path(principal), :remote => true, :class => "icon icon-add" %></p>
3 <p><%= link_to l(:label_add_projects), new_principal_membership_path(principal), :remote => true, :class => "icon icon-add" %></p>
2
4
3 <% if principal.memberships.any? %>
5 <% if memberships.any? %>
4 <table class="list memberships">
6 <table class="list memberships">
5 <thead><tr>
7 <thead><tr>
6 <th><%= l(:label_project) %></th>
8 <th><%= l(:label_project) %></th>
@@ -9,7 +11,7
9 <%= call_table_header_hook principal %>
11 <%= call_table_header_hook principal %>
10 </tr></thead>
12 </tr></thead>
11 <tbody>
13 <tbody>
12 <% principal.memberships.preload(:member_roles => :role).each do |membership| %>
14 <% memberships.each do |membership| %>
13 <% next if membership.new_record? %>
15 <% next if membership.new_record? %>
14 <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
16 <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
15 <td class="project name">
17 <td class="project name">
General Comments 0
You need to be logged in to leave comments. Login now