jro_apps/redmine Commit - r2998:346c569f98f5

Fixed: "None" category issue count is empty while grouping by category (#4308)....

Jean-Philippe Lang -

r2998:346c569f98f5

parent child

Context file:

r2998:346c569f98f5

Collapse all files

app/helpers/queries_helper.rb +29 -35

		@@ -27,44 +27,38 module QueriesHelper
27	27	content_tag('th', column.caption)
28	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
39	30	def column_content(column, issue)
40		if column.is_a?(QueryCustomFieldColumn)
41		cv = issue.custom_values.detect {\|v\| v.custom_field_id == column.custom_field.id}
42		show_value(cv)
43		else
44		value = issue.send(column.name)
45		if value.is_a?(Date)
46		format_date(value)
47		elsif value.is_a?(Time)
48		format_time(value)
	31	value = column.value(issue)
	32
	33	case value.class.name
	34	when 'String'
	35	if column.name == :subject
	36	link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
	37	else
	38	h(value)
	39	end
	40	when 'Time'
	41	format_time(value)
	42	when 'Date'
	43	format_date(value)
	44	when 'Fixnum', 'Float'
	45	if column.name == :done_ratio
	46	progress_bar(value, :width => '80px')
49	47	else
50		case column.name
51		when :subject
52		h((!@project.nil? && @project != issue.project) ? "#{issue.project.name} - " : '') +
53		link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
54		when :project
55		link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
56		when :assigned_to
57		link_to_user value
58		when :author
59		link_to_user value
60		when :done_ratio
61		progress_bar(value, :width => '80px')
62		when :fixed_version
63		link_to(h(value), { :controller => 'versions', :action => 'show', :id => issue.fixed_version_id })
64		else
65		h(value)
66		end
	48	value.to_s
67	49	end
	50	when 'User'
	51	link_to_user value
	52	when 'Project'
	53	link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
	54	when 'Version'
	55	link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
	56	when 'TrueClass'
	57	l(:general_text_Yes)
	58	when 'FalseClass'
	59	l(:general_text_No)
	60	else
	61	h(value)
68	62	end
69	63	end
70	64	end

app/models/custom_field.rb +19 0

                  end
                end
+               def cast_value(value)
+                 casted = nil
+                 unless value.blank?
+                   case field_format
+                   when 'string', 'text', 'list'
+                     casted = value
+                   when 'date'
+                     casted = begin; value.to_date; rescue; nil end
+                   when 'bool'
+                     casted = (value == '1' ? true : false)
+                   when 'int'
+                     casted = value.to_i
+                   when 'float'
+                     casted = value.to_f
+                   end
+                 end
+                 casted
+               end
                # Returns a ORDER BY clause that can used to sort customized
                # objects by their value of the custom field.
                # Returns false, if the custom field can not be used for sorting.

app/models/query.rb +17 -4

                def sortable?
                  !sortable.nil?
                end
+               def value(issue)
+                 issue.send name
+               end
              end
              class QueryCustomFieldColumn < QueryColumn
                def custom_field
                  @cf
                end
+               def value(issue)
+                 cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id}
+                 cv && @cf.cast_value(cv.value)
+               end
              end
              class Query < ActiveRecord::Base
                # Returns the issue count by group or nil if query is not grouped
                def issue_count_by_group
+                 r = nil
                  if grouped?
                    begin
                      # Rails will raise an (unexpected) RecordNotFound if there's only a nil group value
-                     Issue.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
+                     r = Issue.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
                    rescue ActiveRecord::RecordNotFound
-                     {nil => issue_count}
+                     r = {nil => issue_count}
+                   end
+                   c = group_by_column
+                   if c.is_a?(QueryCustomFieldColumn)
+                     r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                    end
-                 else
-                   nil
                  end
+                 r
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end

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

              	<% previous_group = false %>
              	<tbody>
              	<% issues.each do |issue| -%>
-               <% if @query.grouped? && (group = column_value(@query.group_by_column, issue) || '') != previous_group %>
+               <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
                  <% reset_cycle %>
                  <tr class="group open">
                  	<td colspan="<%= query.columns.size + 2 %>">
                  		<span class="expander" onclick="toggleRowGroup(this); return false;">&nbsp;</span>
-                   	<%= group.blank? ? 'None' : group %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+                   	<%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
                  	</td>
              		</tr>
              		<% previous_group = group %>

test/fixtures/custom_fields.yml +14 0

		@@ -101,3 +101,17 custom_fields_007:
101	101	field_format: bool
102	102	default_value: ""
103	103	editable: true
	104	custom_fields_008:
	105	name: Custom date
	106	min_length: 0
	107	regexp: ""
	108	is_for_all: true
	109	is_filter: false
	110	type: IssueCustomField
	111	max_length: 0
	112	possible_values: ""
	113	id: 8
	114	is_required: false
	115	field_format: date
	116	default_value: ""
	117	editable: true

test/fixtures/custom_values.yml +6 0

                customized_id: 11
                id: 16
                value: '1'
+             custom_values_017:
+               customized_type: Issue
+               custom_field_id: 8
+               customized_id: 1
+               id: 17
+               value: '2009-12-01'

test/functional/issues_controller_test.rb +2 -8

                  assert_response :success
                  assert_template 'index.rhtml'
                  assert_not_nil assigns(:issues)
-                 count_by_group = assigns(:issue_count_by_group)
-                 assert_kind_of Hash, count_by_group
-                 assert_kind_of Tracker, count_by_group.keys.first
-                 assert_not_nil count_by_group[Tracker.find(1)]
+                 assert_not_nil assigns(:issue_count_by_group)
                end
                def test_index_with_query_grouped_by_list_custom_field
                  assert_response :success
                  assert_template 'index.rhtml'
                  assert_not_nil assigns(:issues)
-                 count_by_group = assigns(:issue_count_by_group)
-                 assert_kind_of Hash, count_by_group
-                 assert_kind_of String, count_by_group.keys.first
-                 assert_not_nil count_by_group['MySQL']
+                 assert_not_nil assigns(:issue_count_by_group)
                end
                def test_index_sort_by_field_not_included_in_columns

test/unit/query_test.rb +26 0

		@@ -276,6 +276,32 class QueryTest < ActiveSupport::TestCase
276	276	end
277	277	end
278	278
	279	def test_issue_count_by_association_group
	280	q = Query.new(:name => '_', :group_by => 'assigned_to')
	281	count_by_group = q.issue_count_by_group
	282	assert_kind_of Hash, count_by_group
	283	assert_equal %w(NilClass User), count_by_group.keys.collect {\|k\| k.class.name}.uniq.sort
	284	assert_equal %w(Fixnum), count_by_group.values.collect {\|k\| k.class.name}.uniq
	285	assert count_by_group.has_key?(User.find(3))
	286	end
	287
	288	def test_issue_count_by_list_custom_field_group
	289	q = Query.new(:name => '_', :group_by => 'cf_1')
	290	count_by_group = q.issue_count_by_group
	291	assert_kind_of Hash, count_by_group
	292	assert_equal %w(NilClass String), count_by_group.keys.collect {\|k\| k.class.name}.uniq.sort
	293	assert_equal %w(Fixnum), count_by_group.values.collect {\|k\| k.class.name}.uniq
	294	assert count_by_group.has_key?('MySQL')
	295	end
	296
	297	def test_issue_count_by_date_custom_field_group
	298	q = Query.new(:name => '_', :group_by => 'cf_8')
	299	count_by_group = q.issue_count_by_group
	300	assert_kind_of Hash, count_by_group
	301	assert_equal %w(Date NilClass), count_by_group.keys.collect {\|k\| k.class.name}.uniq.sort
	302	assert_equal %w(Fixnum), count_by_group.values.collect {\|k\| k.class.name}.uniq
	303	end
	304
279	305	def test_label_for
280	306	q = Query.new
281	307	assert_equal 'assigned_to', q.label_for('assigned_to_id')

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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