summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-01-03 10:50:40 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-01-03 10:50:40 +0000
commite9810b5de643513f73ea07445e7d7ded731ef446 (patch)
treed7c7faad8829756079eb3e07661e556279decdee /app
parent4ac99328ff2e4f104620b3172005e9b54a26d04d (diff)
downloadredmine-e9810b5de643513f73ea07445e7d7ded731ef446.tar.gz
redmine-e9810b5de643513f73ea07445e7d7ded731ef446.zip
Fixed: bulk edit doesn't include global custom fields (#4505).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3277 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/issues_controller.rb2
-rw-r--r--app/views/issues/bulk_edit.rhtml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 2e0ed6fb3..0d7ef7164 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -273,7 +273,7 @@ class IssuesController < ApplicationController
return
end
@available_statuses = Workflow.available_statuses(@project)
- @custom_fields = @project.issue_custom_fields.select {|f| f.field_format == 'list'}
+ @custom_fields = @project.all_issue_custom_fields.select {|f| f.field_format == 'list'}
end
def move
diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index b298c3c46..d8249a8af 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -46,7 +46,7 @@
</p>
<% @custom_fields.each do |custom_field| %>
-<p><label><%= h(custom_field.name) %></label>
+<p><label><%= h(custom_field.name) %>
<%= select_tag "custom_field_values[#{custom_field.id}]", options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values) %></label>
</p>
<% end %>
@@ -60,5 +60,5 @@
</fieldset>
</div>
-<p><%= submit_tag l(:button_submit) %>
+<p><%= submit_tag l(:button_submit) %></p>
<% end %>