From 3cbbba85134b76e7a441405d9130fec0568dbaba Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 10 Jul 2016 07:45:54 +0000 Subject: [PATCH] Merged r15608 (#23206). git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15613 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 2 ++ test/functional/issues_controller_test.rb | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 1dec57f86..3e45d635e 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -257,6 +257,8 @@ module QueriesHelper tags << hidden_field_tag("v[#{field}][]", value, :id => nil) end end + else + tags << hidden_field_tag("f[]", "", :id => nil) end if query.column_names.present? query.column_names.each do |name| diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index e2b06c87a..6a35d6950 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -488,6 +488,9 @@ class IssuesControllerTest < ActionController::TestCase assert_select 'input[name=?][value=?]', 'sort', 'status' end + + get :index, :project_id => 1, :set_filter => "1", :f => [] + assert_select '#csv-export-form input[name=?][value=?]', 'f[]', '' end def test_index_csv @@ -507,6 +510,14 @@ class IssuesControllerTest < ActionController::TestCase assert_equal 'text/csv; header=present', @response.content_type end + def test_index_csv_without_any_filters + @request.session[:user_id] = 1 + Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 5, :subject => 'Closed issue', :author_id => 1) + get :index, :set_filter => 1, :f => [], :format => 'csv' + assert_response :success + assert_equal Issue.count, assigns(:issues).count + end + def test_index_csv_with_description Issue.generate!(:description => 'test_index_csv_with_description') -- 2.39.5