Various changes on views. On project summary, members are now grouped by role and subprojects are listed inline.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@434 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -83,7 +83,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], :order => 'position')
|
||||
@members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
|
||||
@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')
|
||||
|
||||
@@ -28,7 +28,7 @@ class RolesController < ApplicationController
|
||||
end
|
||||
|
||||
def list
|
||||
@role_pages, @roles = paginate :roles, :per_page => 10, :order => "position"
|
||||
@role_pages, @roles = paginate :roles, :per_page => 25, :order => "position"
|
||||
render :action => "list", :layout => false if request.xhr?
|
||||
end
|
||||
|
||||
@@ -101,7 +101,7 @@ class RolesController < ApplicationController
|
||||
end
|
||||
|
||||
def report
|
||||
@roles = Role.find :all
|
||||
@roles = Role.find(:all, :order => 'position')
|
||||
@permissions = Permission.find :all, :conditions => ["is_public=?", false], :order => 'sort'
|
||||
if request.post?
|
||||
@roles.each do |role|
|
||||
|
||||
Reference in New Issue
Block a user