Allow issue grouping by custom field (#2679).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3071 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 25 insertions, 5 deletions

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 2fa465f4e..2578b784b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -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}
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 165308efd..518226c8f 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -27,6 +27,15 @@ module QueriesHelper
                       content_tag('th', column.caption)
   end
   
+  def column_value(column, issue)
+    if column.is_a?(QueryCustomFieldColumn)
+      cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
+      show_value(cv)
+    else
+      value = issue.send(column.name)
+    end
+  end
+  
   def column_content(column, issue)
     if column.is_a?(QueryCustomFieldColumn)
       cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
diff --git a/app/models/query.rb b/app/models/query.rb
index 7ce95f0ea..816c5c5a0 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -23,6 +23,9 @@ class QueryColumn
     self.name = name
     self.sortable = options[:sortable]
     self.groupable = options[:groupable] || false
+    if groupable == true
+      self.groupable = name.to_s
+    end
     self.default_order = options[:default_order]
   end
   
@@ -41,6 +44,10 @@ class QueryCustomFieldColumn < QueryColumn
   def initialize(custom_field)
     self.name = "cf_#{custom_field.id}".to_sym
     self.sortable = custom_field.order_statement || false
+    if %w(list date bool int).include?(custom_field.field_format)
+      self.groupable = custom_field.order_statement
+    end
+    self.groupable ||= false
     @cf = custom_field
   end
   
@@ -312,6 +319,10 @@ class Query < ActiveRecord::Base
     groupable_columns.detect {|c| c.name.to_s == group_by}
   end
   
+  def group_by_statement
+    group_by_column.groupable
+  end
+  
   def project_statement
     project_clauses = []
     if project && !@project.descendants.active.empty?
diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 9d4ef7dd8..f51a70883 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -10,11 +10,10 @@
           <%= column_header(column) %>
         <% end %>
 	</tr></thead>
-	<% group = false %>
+	<% previous_group = false %>
 	<tbody>
 	<% issues.each do |issue| -%>
-  <% if @query.grouped? && issue.send(@query.group_by) != group %>
-    <% group = issue.send(@query.group_by) %>
+  <% if @query.grouped? && (group = column_value(@query.group_by_column, issue) || '') != previous_group %>
     <% reset_cycle %>
     <tr class="group open">
     	<td colspan="<%= query.columns.size + 2 %>">
@@ -22,6 +21,7 @@
       	<%= group.blank? ? 'None' : group %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
     	</td>
 		</tr>
+		<% previous_group = group %>
   <% end %>
 	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
 	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>