1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-03 14:19:41 +00:00

Use the same layout for custom fields in issue bulk edit page (#32471).

Patch by Shingo Hosotani and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19689 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-04-11 08:58:09 +00:00
parent ea54e1acdb
commit 7a69848d91

View File

@ -94,13 +94,6 @@
</p>
<% end %>
<% @custom_fields.each do |custom_field| %>
<p>
<label><%= custom_field.name %></label>
<%= custom_field_tag_for_bulk_edit('issue', custom_field, @issues, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
</p>
<% end %>
<% if @copy && Setting.link_copied_issue == 'ask' %>
<p>
<label for='link_copy'><%= l(:label_link_copied_issue) %></label>
@ -190,6 +183,37 @@
<% end %>
</div>
</div>
<% custom_fields = @custom_fields %>
<% custom_fields_full_width = custom_fields.select { |value| value.full_width_layout? } %>
<% custom_fields -= custom_fields_full_width %>
<% if custom_fields.present? %>
<div class="splitcontent">
<div class="splitcontentleft">
<% i = 0 %>
<% split_on = (custom_fields.size / 2.0).ceil - 1 %>
<% custom_fields.each do |custom_field| %>
<p>
<label><%= custom_field.name %></label>
<%= custom_field_tag_for_bulk_edit('issue', custom_field, @issues, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
</p>
<% if i == split_on %>
</div><div class="splitcontentright">
<% end %>
<% i += 1 %>
<% end %>
</div>
</div>
<% end %>
<% custom_fields_full_width.each do |custom_field| %>
<p>
<label><%= custom_field.name %></label>
<%= custom_field_tag_for_bulk_edit('issue', custom_field, @issues, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
</p>
<% end %>
</fieldset>
<fieldset>