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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3112 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2009-12-02 18:57:17 +00:00
parent 8b8c24e61f
commit 346c569f98
8 changed files with 115 additions and 49 deletions
+14
View File
@@ -101,3 +101,17 @@ custom_fields_007:
field_format: bool
default_value: ""
editable: true
custom_fields_008:
name: Custom date
min_length: 0
regexp: ""
is_for_all: true
is_filter: false
type: IssueCustomField
max_length: 0
possible_values: ""
id: 8
is_required: false
field_format: date
default_value: ""
editable: true
+6
View File
@@ -95,3 +95,9 @@ custom_values_016:
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'
+2 -8
View File
@@ -177,10 +177,7 @@ class IssuesControllerTest < ActionController::TestCase
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
@@ -188,10 +185,7 @@ class IssuesControllerTest < ActionController::TestCase
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
+26
View File
@@ -276,6 +276,32 @@ class QueryTest < ActiveSupport::TestCase
end
end
def test_issue_count_by_association_group
q = Query.new(:name => '_', :group_by => 'assigned_to')
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?(User.find(3))
end
def test_issue_count_by_list_custom_field_group
q = Query.new(:name => '_', :group_by => 'cf_1')
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?('MySQL')
end
def test_issue_count_by_date_custom_field_group
q = Query.new(:name => '_', :group_by => 'cf_8')
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
end
def test_label_for
q = Query.new
assert_equal 'assigned_to', q.label_for('assigned_to_id')