jro_apps/redmine Commit - r8416:d29638845a9c

Allows project to be changed from the bulk edit form....

Jean-Philippe Lang -

r8416:d29638845a9c

parent child

Context file:

r8416:d29638845a9c

Collapse all files

app/controllers/issues_controller.rb +32 -5

               # Bulk edit a set of issues
               def bulk_edit
                 @issues.sort!
-                @available_statuses = @projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
-                @custom_fields = @projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
+                if User.current.allowed_to?(:move_issues, @projects)
-                @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
+                  @allowed_projects = Issue.allowed_target_projects_on_move
-                @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
+                  if params[:issue]
+                    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id]}
+                    if @target_project
+                      target_projects = [@target_project]
+                    end
+                  end
+                end
+                target_projects ||= @projects
+                @available_statuses = target_projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
+                @custom_fields = target_projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
+                @assignables = target_projects.map(&:assignable_users).inject{|memo,a| memo & a}
+                @trackers = target_projects.map(&:trackers).inject{|memo,t| memo & t}
+                @notes = params[:notes]
+                render :layout => false if request.xhr?
               end
               def bulk_update
                 attributes = parse_params_for_bulk_issue_attributes(params)
                 unsaved_issue_ids = []
+                moved_issues = []
                 @issues.each do |issue|
                   issue.reload
                   journal = issue.init_journal(User.current, params[:notes])
                   issue.safe_attributes = attributes
                   call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
-                  unless issue.save
+                  if issue.save
+                    moved_issues << issue
+                  else
                     # Keep unsaved issue ids to display them in flash error
                     unsaved_issue_ids << issue.id
                   end
                 end
                 set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
+                if params[:follow]
+                  if @issues.size == 1 && moved_issues.size == 1
+                    redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
+                  elsif moved_issues.map(&:project).uniq.size == 1
+                    redirect_to :controller => 'issues', :action => 'index', :project_id => moved_issues.map(&:project).first
+                  end
+                else
                   redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
                 end
+              end
               verify :method => :delete, :only => :destroy, :render => { :nothing => true, :status => :method_not_allowed }
               def destroy

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

                                         ) + h(": #{i.subject}"))
                      }.join("\n").html_safe %></ul>
-            <% form_tag(:action => 'bulk_update') do %>
+            <% form_tag({:action => 'bulk_update'}, :id => 'bulk_edit_form') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
             <div class="box tabular">
             <fieldset class="attributes">
             <legend><%= l(:label_change_properties) %></legend>
             <div class="splitcontentleft">
+            <% if @allowed_projects.present? %>
+            <p>
+              <label for="issue_project_id"><%= l(:field_project) %></label>
+              <%= select_tag('issue[project_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + project_tree_options_for_select(@allowed_projects, :selected => @target_project)) %>
+            </p>
+            <%= observe_field :issue_project_id, :url => {:action => 'bulk_edit'},
+                                                 :update => 'content',
+                                                 :with => "Form.serialize('bulk_edit_form')" %>
+            <% end %>
             <p>
               <label for="issue_tracker_id"><%= l(:field_tracker) %></label>
               <%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, :id, :name)) %>
             </fieldset>
             </div>
-            <p><%= submit_tag l(:button_submit) %></p>
+            <p>
+            	<% if @target_project %>
+            	  <%= submit_tag l(:button_move) %>
+            	  <%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
+            	<% else %>
+            	  <%= submit_tag l(:button_submit) %>
+            	<% end %>
+            </p>
             <% end %>

config/routes.rb +1 -1

               map.resources :queries, :except => [:show]
               map.resources :issues,
-                            :collection => {:bulk_edit => :get, :bulk_update => :post} do |issues|
+                            :collection => {:bulk_edit => [:get, :post], :bulk_update => :post} do |issues|
                 issues.resources :time_entries, :controller => 'timelog',
                                  :collection => {:report => :get}
                 issues.resources :relations, :shallow => true,

test/functional/issues_controller_test.rb +51 0

@@ -2033,6 +2033,7 class IssuesControllerTest < ActionController::TestCase
2033	assert_response :success	2033	assert_response :success
2034	assert_template 'bulk_edit'	2034	assert_template 'bulk_edit'
2035		2035
		2036	assert_tag :select, :attributes => {:name => 'issue[project_id]'}
2036	assert_tag :input, :attributes => {:name => 'issue[parent_issue_id]'}	2037	assert_tag :input, :attributes => {:name => 'issue[parent_issue_id]'}
2037		2038
2038	# Project specific custom field, date type	2039	# Project specific custom field, date type
@@ -2185,6 +2186,38 class IssuesControllerTest < ActionController::TestCase
2185	assert_equal 2, ActionMailer::Base.deliveries.size	2186	assert_equal 2, ActionMailer::Base.deliveries.size
2186	end	2187	end
2187		2188
		2189	def test_bulk_update_project
		2190	@request.session[:user_id] = 2
		2191	post :bulk_update, :ids => [1, 2], :issue => {:project_id => '2'}
		2192	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
		2193	# Issues moved to project 2
		2194	assert_equal 2, Issue.find(1).project_id
		2195	assert_equal 2, Issue.find(2).project_id
		2196	# No tracker change
		2197	assert_equal 1, Issue.find(1).tracker_id
		2198	assert_equal 2, Issue.find(2).tracker_id
		2199	end
		2200
		2201	def test_bulk_update_project_on_single_issue_should_follow_when_needed
		2202	@request.session[:user_id] = 2
		2203	post :bulk_update, :id => 1, :issue => {:project_id => '2'}, :follow => '1'
		2204	assert_redirected_to '/issues/1'
		2205	end
		2206
		2207	def test_bulk_update_project_on_multiple_issues_should_follow_when_needed
		2208	@request.session[:user_id] = 2
		2209	post :bulk_update, :id => [1, 2], :issue => {:project_id => '2'}, :follow => '1'
		2210	assert_redirected_to '/projects/onlinestore/issues'
		2211	end
		2212
		2213	def test_bulk_update_tracker
		2214	@request.session[:user_id] = 2
		2215	post :bulk_update, :ids => [1, 2], :issue => {:tracker_id => '2'}
		2216	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
		2217	assert_equal 2, Issue.find(1).tracker_id
		2218	assert_equal 2, Issue.find(2).tracker_id
		2219	end
		2220
2188	def test_bulk_update_status	2221	def test_bulk_update_status
2189	@request.session[:user_id] = 2	2222	@request.session[:user_id] = 2
2190	# update issues priority	2223	# update issues priority
@@ -2198,6 +2231,24 class IssuesControllerTest < ActionController::TestCase
2198	assert issue.closed?	2231	assert issue.closed?
2199	end	2232	end
2200		2233
		2234	def test_bulk_update_priority
		2235	@request.session[:user_id] = 2
		2236	post :bulk_update, :ids => [1, 2], :issue => {:priority_id => 6}
		2237
		2238	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
		2239	assert_equal 6, Issue.find(1).priority_id
		2240	assert_equal 6, Issue.find(2).priority_id
		2241	end
		2242
		2243	def test_bulk_update_with_notes
		2244	@request.session[:user_id] = 2
		2245	post :bulk_update, :ids => [1, 2], :notes => 'Moving two issues'
		2246
		2247	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
		2248	assert_equal 'Moving two issues', Issue.find(1).journals.sort_by(&:id).last.notes
		2249	assert_equal 'Moving two issues', Issue.find(2).journals.sort_by(&:id).last.notes
		2250	end
		2251
2201	def test_bulk_update_parent_id	2252	def test_bulk_update_parent_id
2202	@request.session[:user_id] = 2	2253	@request.session[:user_id] = 2
2203	post :bulk_update, :ids => [1, 3],	2254	post :bulk_update, :ids => [1, 3],

test/integration/routing/issues_test.rb +5 0

                     { :method => 'get', :path => "/issues/bulk_edit" },
                     { :controller => 'issues', :action => 'bulk_edit' }
                   )
+                # For updating the bulk edit form
+                assert_routing(
+                    { :method => 'post', :path => "/issues/bulk_edit" },
+                    { :controller => 'issues', :action => 'bulk_edit' }
+                  )
                 assert_routing(
                     { :method => 'post', :path => "/issues/bulk_update" },
                     { :controller => 'issues', :action => 'bulk_update' }

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