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

Fix issues and spent time CSV export does not include custom fields with "Full width layout" enabled (#33169).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19632 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-04-01 16:20:10 +00:00
parent 0a80c4c14b
commit c7806ccbdf
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/issues/index.html.erb
View File

@@ -48,8 +48,9 @@
<label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label> <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
</p> </p>
<p> <p>
<label><%= check_box_tag 'c[]', 'description', @query.has_column?(:description) %> <%= l(:field_description) %></label> <% @query.available_block_columns.each do |column| %>
<label><%= check_box_tag 'c[]', 'last_notes', @query.has_column?(:last_notes) %> <%= l(:label_last_notes) %></label> <label><%= check_box_tag 'c[]', column.name, @query.has_column?(column) %> <%= column.caption %></label>
<% end %>
</p> </p>
<%= export_csv_encoding_select_tag %> <%= export_csv_encoding_select_tag %>
<% if @issue_count > Setting.issues_export_limit.to_i %> <% if @issue_count > Setting.issues_export_limit.to_i %>

5
app/views/timelog/index.html.erb
View File

@@ -40,6 +40,11 @@
<label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br /> <label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br />
<label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label> <label><%= radio_button_tag 'c[]', 'all_inline' %> <%= l(:description_all_columns) %></label>
</p> </p>
<p>
<% @query.available_block_columns.each do |column| %>
<label><%= check_box_tag 'c[]', column.name, @query.has_column?(:column) %> <%= column.caption %></label>
<% end %>
</p>
<%= export_csv_encoding_select_tag %> <%= export_csv_encoding_select_tag %>
<p class="buttons"> <p class="buttons">
<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %> <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %>

17
test/functional/issues_controller_test.rb
View File

@@ -777,6 +777,23 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select '#csv-export-form input[name=?][value=?]', 'f[]', '' assert_select '#csv-export-form input[name=?][value=?]', 'f[]', ''
end 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 def test_index_csv
get(:index, :params => {:format => 'csv'}) get(:index, :params => {:format => 'csv'})
assert_response :success assert_response :success