Allow issue grouping by custom field (#2679).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3071 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2009-11-16 18:07:30 +00:00
parent 2a3a6da45a
commit 71bc44a89d
7 changed files with 65 additions and 7 deletions
+2 -2
View File
@@ -64,7 +64,7 @@ class IssuesController < ApplicationController
@issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
@issue_pages = Paginator.new self, @issue_count, limit, params['page']
@issues = Issue.find :all, :order => [@query.group_by_sort_order, sort_clause].compact.join(','),
:include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
:include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
:conditions => @query.statement,
:limit => limit,
:offset => @issue_pages.current.offset
@@ -73,7 +73,7 @@ class IssuesController < ApplicationController
if @query.grouped?
# Retrieve the issue count by group
@issue_count_by_group = begin
Issue.count(:group => @query.group_by, :include => [:status, :project], :conditions => @query.statement)
Issue.count(:group => @query.group_by_statement, :include => [:status, :project], :conditions => @query.statement)
# Rails will raise an (unexpected) error if there's only a nil group value
rescue ActiveRecord::RecordNotFound
{nil => @issue_count}