From b481e76ee2b54a57a91d74269270321983635dab Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 17 Mar 2007 17:44:29 +0000 Subject: [PATCH] members are now sorted according to roles order on projects/show removed the useless "members" item in the project menu git-svn-id: http://redmine.rubyforge.org/svn/trunk@341 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 2 +- app/views/layouts/base.rhtml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 61b772194..f02a0e1e6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -82,7 +82,7 @@ class ProjectsController < ApplicationController # Show @project def show @custom_values = @project.custom_values.find(:all, :include => :custom_field) - @members = @project.members.find(:all, :include => [:user, :role]) + @members = @project.members.find(:all, :include => [:user, :role], :order => 'position') @subprojects = @project.children if @project.children.size > 0 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC") @trackers = Tracker.find(:all, :order => 'position') diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 2c7ceb9a4..030116c60 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -91,8 +91,7 @@ <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> - <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %> - <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> + <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %> <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %> @@ -116,8 +115,7 @@
  • <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
  • <%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %>
  • <%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %>
    • -
  • <%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %>
    • -
  • <%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %>
    • +
  • <%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %>
  • <%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %>
  • <%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %>
  • <%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %>
    • -- 2.39.5