| @@ -37,6 +37,10 class Member < ActiveRecord::Base | |||
|
|
37 | 37 | reorder("#{Role.table_name}.position"). |
|
|
38 | 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 | 45 | alias :base_reload :reload |
|
|
42 | 46 | def reload(*args) |
| @@ -1,6 +1,8 | |||
|
|
1 | <% memberships = principal.memberships.preload(:member_roles => :role).sorted_by_project.to_a %> | |
|
|
2 | ||
|
|
1 | 3 | <p><%= link_to l(:label_add_projects), new_principal_membership_path(principal), :remote => true, :class => "icon icon-add" %></p> |
|
|
2 | 4 | |
|
|
3 |
<% if |
|
|
|
5 | <% if memberships.any? %> | |
|
|
4 | 6 | <table class="list memberships"> |
|
|
5 | 7 | <thead><tr> |
|
|
6 | 8 | <th><%= l(:label_project) %></th> |
| @@ -9,7 +11,7 | |||
|
|
9 | 11 | <%= call_table_header_hook principal %> |
|
|
10 | 12 | </tr></thead> |
|
|
11 | 13 | <tbody> |
|
|
12 |
<% |
|
|
|
14 | <% memberships.each do |membership| %> | |
|
|
13 | 15 | <% next if membership.new_record? %> |
|
|
14 | 16 | <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class"> |
|
|
15 | 17 | <td class="project name"> |
General Comments 0
You need to be logged in to leave comments.
Login now