meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-28 19:29:38 +00:00
Code Issues Releases Wiki Activity

Fixed that total estimated time column is shown even when estimated time field is deactivated (#31779).

Browse Source 
Patch by Felix Schäfer and Yuichi HARADA.

git-svn-id: http://svn.redmine.org/redmine/trunk@18743 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2019-10-19 08:30:15 +00:00
parent 57a66e950c
commit c5b5f0d6a9
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/issue_query.rb
View File

@ -247,6 +247,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

@ -2085,6 +2085,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!