meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 09:21:12 +00:00
Code Issues Releases Wiki Activity

Sort user memberships by project.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16150 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-01-07 10:28:59 +00:00
parent a4f167ec1a
commit 3c005719ae
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/member.rb
View File

@ -37,6 +37,10 @@ class Member < ActiveRecord::Base
reorder("#{Role.table_name}.position").
order(Principal.fields_for_order_statement)
}
scope :sorted_by_project, lambda {
includes(:project).
reorder("#{Project.table_name}.lft")
}
alias :base_reload :reload
def reload(*args)

6
app/views/principal_memberships/_index.html.erb
View File

@ -1,6 +1,8 @@
<% memberships = principal.memberships.preload(:member_roles => :role).sorted_by_project.to_a %>
<p><%= link_to l(:label_add_projects), new_principal_membership_path(principal), :remote => true, :class => "icon icon-add" %></p>
<% if principal.memberships.any? %>
<% if memberships.any? %>
<table class="list memberships">
<thead><tr>
<th><%= l(:label_project) %></th>
@ -9,7 +11,7 @@
<%= call_table_header_hook principal %>
</tr></thead>
<tbody>
<% principal.memberships.preload(:member_roles => :role).each do |membership| %>
<% memberships.each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
<td class="project name">