diff --git a/groups/app/controllers/projects_controller.rb b/groups/app/controllers/projects_controller.rb index b71ec1ecd..ba6955221 100644 --- a/groups/app/controllers/projects_controller.rb +++ b/groups/app/controllers/projects_controller.rb @@ -86,7 +86,6 @@ class ProjectsController < ApplicationController # Show @project def show @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position") - @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role} @subprojects = @project.active_children @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/groups/app/helpers/projects_helper.rb b/groups/app/helpers/projects_helper.rb index 0696eefbf..95268c124 100644 --- a/groups/app/helpers/projects_helper.rb +++ b/groups/app/helpers/projects_helper.rb @@ -29,6 +29,16 @@ module ProjectsHelper h(truncate(text, 250)) end + # Renders the member list displayed on project overview + def render_member_list(project) + members_by_role = project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role} + if members_by_role.any? + title = content_tag('h3', l(:label_member_plural), :class => 'icon22 icon22-users') + content = members_by_role.keys.sort.collect { |role| "#{role.name}: " + members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") }.join('
') + content_tag('div', title + content, :class => 'box') + end + end + def project_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural}, {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural}, diff --git a/groups/app/views/projects/show.rhtml b/groups/app/views/projects/show.rhtml index 62b911937..66c4838d6 100644 --- a/groups/app/views/projects/show.rhtml +++ b/groups/app/views/projects/show.rhtml @@ -35,16 +35,7 @@
- <% if @members_by_role.any? %> -
-

<%=l(:label_member_plural)%>

-

<% @members_by_role.keys.sort.each do |role| %> - <%= role.name %>: - <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %> -
- <% end %>

-
- <% end %> + <%= render_member_list(@project) %> <% if @news.any? && authorize_for('news', 'index') %>