jro_apps/redmine Commit - r8926:7448e0dbc41a

Fixed that the bulk edit/copy form does not propose versions and categories for the target project (#10350)....

Jean-Philippe Lang -

r8926:7448e0dbc41a

parent child

Context file:

r8926:7448e0dbc41a

Collapse all files

app/controllers/issues_controller.rb +3 -1

                 if User.current.allowed_to?(:move_issues, @projects)
                   @allowed_projects = Issue.allowed_target_projects_on_move
                   if params[:issue]
-                    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id]}
+                    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
                     if @target_project
                       target_projects = [@target_project]
                     end
                 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.reduce(:&)
                 @assignables = target_projects.map(&:assignable_users).reduce(:&)
                 @trackers = target_projects.map(&:trackers).reduce(:&)
+                @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
+                @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
                 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                 render :layout => false if request.xhr?

app/views/issues/bulk_edit.html.erb +2 -7

                                              content_tag('option', l(:label_nobody), :value => 'none') +
                                              principals_options_for_select(@assignables)) %>
             </p>
-            <% if @project %>
             <p>
               <label for='issue_category_id'><%= l(:field_category) %></label>
               <%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none') +
-                                            options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
+                                            options_from_collection_for_select(@categories, :id, :name)) %>
             </p>
-            <% end %>
-            <% #TODO: allow editing versions when multiple projects %>
-            <% if @project %>
             <p>
               <label for='issue_fixed_version_id'><%= l(:field_fixed_version) %></label>
               <%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none') +
-                                               version_options_for_select(@project.shared_versions.open.sort)) %>
+                                               version_options_for_select(@versions.sort)) %>
             </p>
-            <% end %>
             <% @custom_fields.each do |custom_field| %>
               <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>

test/functional/issues_controller_test.rb +22 0

@@ -2672,6 +2672,28 class IssuesControllerTest < ActionController::TestCase
2672	:children => {:count => 3} # 2 statuses + "no change" option	2672	:children => {:count => 3} # 2 statuses + "no change" option
2673	end	2673	end
2674		2674
		2675	def test_bulk_edit_should_propose_target_project_open_shared_versions
		2676	@request.session[:user_id] = 2
		2677	post :bulk_edit, :ids => [1, 2, 6], :issue => {:project_id => 1}
		2678	assert_response :success
		2679	assert_template 'bulk_edit'
		2680	assert_equal Project.find(1).shared_versions.open.all.sort, assigns(:versions).sort
		2681	assert_tag 'select',
		2682	:attributes => {:name => 'issue[fixed_version_id]'},
		2683	:descendant => {:tag => 'option', :content => '2.0'}
		2684	end
		2685
		2686	def test_bulk_edit_should_propose_target_project_categories
		2687	@request.session[:user_id] = 2
		2688	post :bulk_edit, :ids => [1, 2, 6], :issue => {:project_id => 1}
		2689	assert_response :success
		2690	assert_template 'bulk_edit'
		2691	assert_equal Project.find(1).issue_categories.sort, assigns(:categories).sort
		2692	assert_tag 'select',
		2693	:attributes => {:name => 'issue[category_id]'},
		2694	:descendant => {:tag => 'option', :content => 'Recipes'}
		2695	end
		2696
2675	def test_bulk_update	2697	def test_bulk_update
2676	@request.session[:user_id] = 2	2698	@request.session[:user_id] = 2
2677	# update issues priority	2699	# update issues priority

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages