jro_apps/redmine Commit - r2635:da2854cf750b

Display all users roles on project overview (#3339)....

Jean-Philippe Lang -

r2635:da2854cf750b

parent child

Context file:

r2635:da2854cf750b

app/controllers/projects_controller.rb +1 -1

                   redirect_to_project_menu_item(@project, params[:jump]) && return
                 end
-                @members_by_role = @project.members.find(:all, :include => [:user, :roles], :order => 'position').group_by {|m| m.roles.first}
+                @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers

app/models/project.rb +11 0

@@ -245,6 +245,17 class Project < ActiveRecord::Base
245	:order => "#{Tracker.table_name}.position")	245	:order => "#{Tracker.table_name}.position")
246	end	246	end
247		247
		248	# Returns a hash of project users grouped by role
		249	def users_by_role
		250	members.find(:all, :include => [:user, :roles]).inject({}) do \|h, m\|
		251	m.roles.each do \|r\|
		252	h[r] \|\|= []
		253	h[r] << m.user
		254	end
		255	h
		256	end
		257	end
		258
248	# Deletes all project's members	259	# Deletes all project's members
249	def delete_all_members	260	def delete_all_members
250	me, mr = Member.table_name, MemberRole.table_name	261	me, mr = Member.table_name, MemberRole.table_name

app/views/projects/show.rhtml +3 -5

             </div>
             <div class="splitcontentright">
-                <% if @members_by_role.any? %>
+              <% if @users_by_role.any? %>
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
-            		<p><% @members_by_role.keys.sort.each do |role| %>
+            		<p><% @users_by_role.keys.sort.each do |role| %>
-            		<%= role.name %>:
+            		<%= role.name %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %><br />
-            		<%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
-            		<br />
             		<% end %></p>
             	</div>
             	<% end %>

test/unit/project_test.rb +8 0

                 assert_equal [5, 6, 3, 4], d.collect(&:id)
               end
+              def test_users_by_role
+                users_by_role = Project.find(1).users_by_role
+                assert_kind_of Hash, users_by_role
+                role = Role.find(1)
+                assert_kind_of Array, users_by_role[role]
+                assert users_by_role[role].include?(User.find(2))
+              end
               def test_rolled_up_trackers
                 parent = Project.find(1)
                 parent.trackers = Tracker.find([1,2])

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages