meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-16 22:18:12 +00:00
Code Issues Releases Wiki Activity

Merged r17237 from trunk to 3.4-stable (#28393).

Browse Source 
Patch by Gregor Schmidt.


git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17238 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-03-25 09:52:23 +00:00
parent d0fd3a373e
commit 6ecd71e6c7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/trackers_controller.rb
View File

@ -106,6 +106,6 @@ class TrackersController < ApplicationController
return return
end end
@trackers = Tracker.sorted.to_a @trackers = Tracker.sorted.to_a
@custom_fields = IssueCustomField.all.sort @custom_fields = IssueCustomField.sorted
end end
end end

5
app/views/trackers/_form.html.erb
View File

@ -21,10 +21,11 @@
</p> </p>
<%= hidden_field_tag 'tracker[core_fields][]', '' %> <%= hidden_field_tag 'tracker[core_fields][]', '' %>
<% if IssueCustomField.all.any? %> <% @issue_custom_fields = IssueCustomField.sorted %>
<% if @issue_custom_fields.present? %>
<p> <p>
<label><%= l(:label_custom_field_plural) %></label> <label><%= l(:label_custom_field_plural) %></label>
<% IssueCustomField.all.each do |field| %> <% @issue_custom_fields.each do |field| %>
<label class="block"> <label class="block">
<%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.to_a.include?(field), :id => nil %> <%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.to_a.include?(field), :id => nil %>
<%= field.name %> <%= field.name %>