Browse Source

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
tags/4.0.0
Jean-Philippe Lang 6 years ago
parent
commit
0a3e85b92d
2 changed files with 16 additions and 2 deletions
  1. 1
    2
      app/models/time_entry_query.rb
  2. 15
    0
      test/functional/queries_controller_test.rb

+ 1
- 2
app/models/time_entry_query.rb View File

@@ -36,8 +36,7 @@ class TimeEntryQuery < Query

def initialize(attributes=nil, *args)
super attributes
self.filters ||= {}
add_filter('spent_on', '*') unless filters.present?
self.filters ||= { 'spent_on' => {:operator => "*", :values => []} }
end

def initialize_available_filters

+ 15
- 0
test/functional/queries_controller_test.rb View File

@@ -592,4 +592,19 @@ class QueriesControllerTest < Redmine::ControllerTest
json = ActiveSupport::JSON.decode(response.body)
assert_include ["OnlineStore - Systemwide visible version", "7", "open"], json
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

Loading…
Cancel
Save