diff options
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.rhtml | 4 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 2 |
3 files changed, 5 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 %> diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index e73e24a05..bf5ffb2b9 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -946,6 +946,8 @@ class IssuesControllerTest < ActionController::TestCase get :bulk_edit, :ids => [1, 2] assert_response :success assert_template 'bulk_edit' + # System wide custom field + assert_tag :select, :attributes => {:name => 'custom_field_values[1]'} end def test_bulk_edit |