Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 17:26:06 +01:00
Code Issues Packages Projects Releases Activity

Adds issue category filter to spent time queries (#28391).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17249 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2018-04-01 00:29:22 +00:00
parent 07ce80f9b2
commit fa76ec5c01
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/time_entry_query.rb
View File

@@ -65,6 +65,10 @@ class TimeEntryQuery < Query
:type => :list, :type => :list,
:name => l("label_attribute_of_issue", :name => l(:field_fixed_version)), :name => l("label_attribute_of_issue", :name => l(:field_fixed_version)),
:values => lambda { fixed_version_values }) :values => lambda { fixed_version_values })
add_available_filter "issue.category_id",
:type => :list_optional,
:name => l("label_attribute_of_issue", :name => l(:field_category)),
:values => lambda { project.issue_categories.collect{|s| [s.name, s.id.to_s] } } if project
add_available_filter("user_id", add_available_filter("user_id",
:type => :list_optional, :values => lambda { author_values } :type => :list_optional, :values => lambda { author_values }
@@ -197,6 +201,10 @@ class TimeEntryQuery < Query
sql_for_field("status_id", operator, value, Issue.table_name, "status_id") sql_for_field("status_id", operator, value, Issue.table_name, "status_id")
end end
def sql_for_issue_category_id_field(field, operator, value)
sql_for_field("category_id", operator, value, Issue.table_name, "category_id")
end
# Accepts :from/:to params as shortcut filters # Accepts :from/:to params as shortcut filters
def build_from_params(params, defaults={}) def build_from_params(params, defaults={})
super super

11
test/functional/timelog_controller_test.rb
View File

@@ -1025,6 +1025,17 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_equal Tracker.where(:id => [1, 2, 3]).sorted.pluck(:name), values assert_equal Tracker.where(:id => [1, 2, 3]).sorted.pluck(:name), values
end end
def test_index_with_issue_category_filter
get :index, :params => {
:project_id => 'ecookbook',
:f => ['issue.category_id'],
:op => {'issue.category_id' => '='},
:v => {'issue.category_id' => ['1']}
}
assert_response :success
assert_equal ['1', '2'], css_select('input[name="ids[]"]').map {|e| e.attr('value')}
end
def test_index_with_filter_on_issue_custom_field def test_index_with_filter_on_issue_custom_field
issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'}) issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
entry = TimeEntry.generate!(:issue => issue, :hours => 2.5) entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)

5
test/unit/time_entry_query_test.rb
View File

@@ -102,4 +102,9 @@ class TimeEntryQueryTest < ActiveSupport::TestCase
assert_include "issue.cf_#{field_on_project.id}", query.available_columns.map(&:name).map(&:to_s) assert_include "issue.cf_#{field_on_project.id}", query.available_columns.map(&:name).map(&:to_s)
assert_not_include "issue.cf_#{field_not_on_project.id}", query.available_columns.map(&:name).map(&:to_s) assert_not_include "issue.cf_#{field_not_on_project.id}", query.available_columns.map(&:name).map(&:to_s)
end end
def test_issue_category_filter_should_not_be_available_in_global_queries
query = TimeEntryQuery.new(:project => nil, :name => '_')
assert !query.available_filters.has_key?('issue.category_id')
end
end end