diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3f29e4e..0dcc874 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -112,7 +112,7 @@ class ProjectsController < ApplicationController 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 diff --git a/app/models/project.rb b/app/models/project.rb index 64a5e98..b022ed9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -245,6 +245,17 @@ class Project < ActiveRecord::Base :order => "#{Tracker.table_name}.position") end + # Returns a hash of project users grouped by role + def users_by_role + members.find(:all, :include => [:user, :roles]).inject({}) do |h, m| + m.roles.each do |r| + h[r] ||= [] + h[r] << m.user + end + h + end + end + # Deletes all project's members def delete_all_members me, mr = Member.table_name, MemberRole.table_name diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index 304fe5d..4e068a5 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -35,13 +35,11 @@
<% @members_by_role.keys.sort.each do |role| %>
- <%= role.name %>:
- <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
-
+
<% @users_by_role.keys.sort.each do |role| %>
+ <%= role.name %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %>
<% end %>