jro_apps/redmine Commit - r2957:71bc44a89dce

Allow issue grouping by custom field (#2679)....

Jean-Philippe Lang -

r2957:71bc44a89dce

parent child

Context file:

r2957:71bc44a89dce

app/controllers/issues_controller.rb +2 -2

                   @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
                       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}

app/helpers/queries_helper.rb +9 0

@@ -27,6 +27,15 module QueriesHelper
27	content_tag('th', column.caption)	27	content_tag('th', column.caption)
28	end	28	end
29		29
		30	def column_value(column, issue)
		31	if column.is_a?(QueryCustomFieldColumn)
		32	cv = issue.custom_values.detect {\|v\| v.custom_field_id == column.custom_field.id}
		33	show_value(cv)
		34	else
		35	value = issue.send(column.name)
		36	end
		37	end
		38
30	def column_content(column, issue)	39	def column_content(column, issue)
31	if column.is_a?(QueryCustomFieldColumn)	40	if column.is_a?(QueryCustomFieldColumn)
32	cv = issue.custom_values.detect {\|v\| v.custom_field_id == column.custom_field.id}	41	cv = issue.custom_values.detect {\|v\| v.custom_field_id == column.custom_field.id}

app/models/query.rb +11 0

                 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
               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
                 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?

app/views/issues/_list.rhtml +3 -3

                       <%= 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 %>
+              <% if @query.grouped? && (group = column_value(@query.group_by_column, issue) || '') != previous_group %>
-                <% group = issue.send(@query.group_by) %>
                 <% reset_cycle %>
                 <tr class="group open">
                 	<td colspan="<%= query.columns.size + 2 %>">
                   	<%= 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>

test/fixtures/queries.yml +19 0

@@ -134,4 +134,23 queries_008:
134		134
135	user_id: 2	135	user_id: 2
136	column_names:	136	column_names:
		137	queries_009:
		138	id: 9
		139	project_id:
		140	is_public: true
		141	name: Open issues grouped by list custom field
		142	filters: \|
		143	---
		144	status_id:
		145	:values:
		146	- "1"
		147	:operator: o
		148
		149	user_id: 1
		150	column_names:
		151	group_by: cf_1
		152	sort_criteria: \|
		153	---
		154	- - priority
		155	- desc
137		156

test/functional/issues_controller_test.rb +16 -2

@@ -171,12 +171,26 class IssuesControllerTest < ActionController::TestCase
171	assert_nil assigns(:issue_count_by_group)	171	assert_nil assigns(:issue_count_by_group)
172	end	172	end
173		173
174	def test_index_with_grouped_~~query~~	174	def test_index_with_query_grouped_by_tracker
175	get :index, :project_id => 1, :query_id => 6	175	get :index, :project_id => 1, :query_id => 6
176	assert_response :success	176	assert_response :success
177	assert_template 'index.rhtml'	177	assert_template 'index.rhtml'
178	assert_not_nil assigns(:issues)	178	assert_not_nil assigns(:issues)
179	~~assert_not_nil~~ assigns(:issue_count_by_group)	179	count_by_group = assigns(:issue_count_by_group)
		180	assert_kind_of Hash, count_by_group
		181	assert_kind_of Tracker, count_by_group.keys.first
		182	assert_not_nil count_by_group[Tracker.find(1)]
		183	end
		184
		185	def test_index_with_query_grouped_by_list_custom_field
		186	get :index, :project_id => 1, :query_id => 9
		187	assert_response :success
		188	assert_template 'index.rhtml'
		189	assert_not_nil assigns(:issues)
		190	count_by_group = assigns(:issue_count_by_group)
		191	assert_kind_of Hash, count_by_group
		192	assert_kind_of String, count_by_group.keys.first
		193	assert_not_nil count_by_group['MySQL']
180	end	194	end
181		195
182	def test_index_csv_with_project	196	def test_index_csv_with_project

test/unit/query_test.rb +5 0

                 assert q.has_column?(c)
               end
+              def test_groupable_columns_should_include_custom_fields
+                q = Query.new
+                assert q.groupable_columns.detect {|c| c.is_a? QueryCustomFieldColumn}
+              end
               def test_default_sort
                 q = Query.new
                 assert_equal [], q.sort_criteria

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages