Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-17 13:03:01 +01:00
Code Issues Packages Projects Releases Activity

Merged r18743 to 4.0-stable (#31779).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18744 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2019-10-19 08:37:16 +00:00
parent 883b0004d3
commit e9322b9057
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/issue_query.rb
View File

@@ -227,6 +227,7 @@ class IssueQuery < Query
end
disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
disabled_fields << "total_estimated_hours" if disabled_fields.include?("estimated_hours")
@available_columns.reject! {|column|
disabled_fields.include?(column.name.to_s)
}

19
test/unit/query_test.rb
View File

@@ -1995,6 +1995,25 @@ class QueryTest < ActiveSupport::TestCase
end
end
def test_available_columns_should_not_include_total_estimated_hours_when_trackers_disabled_estimated_hours
Tracker.visible.each do |tracker|
tracker.core_fields = tracker.core_fields.reject{|field| field == 'estimated_hours'}
tracker.save!
end
query = IssueQuery.new
available_columns = query.available_columns.map(&:name)
assert_not_include :estimated_hours, available_columns
assert_not_include :total_estimated_hours, available_columns
tracker = Tracker.visible.first
tracker.core_fields = ['estimated_hours']
tracker.save!
query = IssueQuery.new
available_columns = query.available_columns.map(&:name)
assert_include :estimated_hours, available_columns
assert_include :total_estimated_hours, available_columns
end
def setup_member_of_group
Group.destroy_all # No fixtures
@user_in_group = User.generate!