mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Filtering time entries after issue's target version doesn't work as expected in some cases (#26667).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16997 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
738bb449ef
commit
0a3e85b92d
@ -36,8 +36,7 @@ class TimeEntryQuery < Query
|
|||||||
|
|
||||||
def initialize(attributes=nil, *args)
|
def initialize(attributes=nil, *args)
|
||||||
super attributes
|
super attributes
|
||||||
self.filters ||= {}
|
self.filters ||= { 'spent_on' => {:operator => "*", :values => []} }
|
||||||
add_filter('spent_on', '*') unless filters.present?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize_available_filters
|
def initialize_available_filters
|
||||||
|
|||||||
@ -592,4 +592,19 @@ class QueriesControllerTest < Redmine::ControllerTest
|
|||||||
json = ActiveSupport::JSON.decode(response.body)
|
json = ActiveSupport::JSON.decode(response.body)
|
||||||
assert_include ["OnlineStore - Systemwide visible version", "7", "open"], json
|
assert_include ["OnlineStore - Systemwide visible version", "7", "open"], json
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_subproject_filter_time_entries_with_project_id_should_return_filter_values
|
||||||
|
@request.session[:user_id] = 2
|
||||||
|
get :filter, :params => {
|
||||||
|
:project_id => 1,
|
||||||
|
:type => 'TimeEntryQuery',
|
||||||
|
:name => 'subproject_id'
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_response :success
|
||||||
|
assert_equal 'application/json', response.content_type
|
||||||
|
json = ActiveSupport::JSON.decode(response.body)
|
||||||
|
assert_equal 4, json.count
|
||||||
|
assert_include ["Private child of eCookbook","5"], json
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user