From e1cb1c8530eeef2820dafd7429196163b1a98862 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 1 Apr 2020 16:27:51 +0000
Subject: [PATCH] Merged r19632 and r19633 from trunk to 4.1-stable (#33169).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19634 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/index.html.erb           | 14 ++++++++++----
 app/views/timelog/index.html.erb          | 10 ++++++++++
 public/stylesheets/application.css        |  3 ++-
 test/functional/issues_controller_test.rb | 17 +++++++++++++++++
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index fccf118c9..880c953ea 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -47,10 +47,16 @@
     <label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br />
     <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
   </p>
-  <p>
-    <label><%= check_box_tag 'c[]', 'description', @query.has_column?(:description) %> <%= l(:field_description) %></label>
-    <label><%= check_box_tag 'c[]', 'last_notes', @query.has_column?(:last_notes) %> <%= l(:label_last_notes) %></label>
-  </p>
+  <% if @query.available_block_columns.any? %>
+    <fieldset id="csv-export-block-columns">
+      <legend>
+        <%= toggle_checkboxes_link('#csv-export-block-columns input[type=checkbox]') %>
+      </legend>
+      <% @query.available_block_columns.each do |column| %>
+        <label><%= check_box_tag 'c[]', column.name, @query.has_column?(column), :id => nil %> <%= column.caption %></label>
+      <% end %>
+    </fieldset>
+  <% end %>
   <%= export_csv_encoding_select_tag %>
   <% if @issue_count > Setting.issues_export_limit.to_i %>
   <p class="icon icon-warning">
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index b9afc7475..7b9778d8e 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -40,6 +40,16 @@
     <label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br />
     <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
   </p>
+  <% if @query.available_block_columns.any? %>
+    <fieldset id="csv-export-block-columns">
+      <legend>
+        <%= toggle_checkboxes_link('#csv-export-block-columns input[type=checkbox]') %>
+      </legend>
+      <% @query.available_block_columns.each do |column| %>
+        <label><%= check_box_tag 'c[]', column.name, @query.has_column?(:column), :id => nil %> <%= column.caption %></label>
+      <% end %>
+    </fieldset>
+  <% end %>
   <%= export_csv_encoding_select_tag %>
   <p class="buttons">
     <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 64b25b07d..5bd13e629 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -334,7 +334,7 @@ tr.user.locked, tr.user.registered { color: #aaa; }
 tr.user.locked a, tr.user.registered a { color: #aaa; }
 
 table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
-table.permissions tr.group>td:nth-of-type(1), 
+table.permissions tr.group>td:nth-of-type(1),
 table.tracker-summary tr.group>td:nth-of-type(1) {font-weight: bold;}
 
 tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
@@ -761,6 +761,7 @@ span.pagination>span {white-space:nowrap;}
 }
 
 #search-form fieldset p {margin:0.2em 0;}
+#csv-export-options fieldset {padding: 0;}
 
 /***** Tabular forms ******/
 .tabular p{
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index c4f1b5f47..dee8060ec 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -661,6 +661,23 @@ class IssuesControllerTest < Redmine::ControllerTest
     assert_select '#csv-export-form input[name=?][value=?]', 'f[]', ''
   end
 
+  def test_index_should_show_block_columns_in_csv_export_form
+    field = IssueCustomField.
+              create!(
+                :name => 'Long text', :field_format => 'text',
+                :full_width_layout => '1',
+                :tracker_ids => [1], :is_for_all => true
+              )
+    get :index
+
+    assert_response :success
+    assert_select '#csv-export-form' do
+      assert_select 'input[value=?]', 'description'
+      assert_select 'input[value=?]', 'last_notes'
+      assert_select 'input[value=?]', "cf_#{field.id}"
+    end
+  end
+
   def test_index_csv
     get :index, :params => {
         :format => 'csv'
-- 
2.39.5