jro_apps/redmine Commit - r8418:065376c160b0

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

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

                 end
               end
-              # Bulk edit a set of issues
+              # Bulk edit/copy a set of issues
               def bulk_edit
                 @issues.sort!
+                @copy = params[:copy].present?
+                @notes = params[:notes]
                 if User.current.allowed_to?(:move_issues, @projects)
                   @allowed_projects = Issue.allowed_target_projects_on_move
                 @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
                 @issues.sort!
+                @copy = params[:copy].present?
                 attributes = parse_params_for_bulk_issue_attributes(params)
                 unsaved_issue_ids = []
                 moved_issues = []
                 @issues.each do |issue|
                   issue.reload
+                  if @copy
+                    issue = Issue.new.copy_from(issue)
+                  end
                   journal = issue.init_journal(User.current, params[:notes])
                   issue.safe_attributes = attributes
                   call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })

               <li><%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
                       :class => 'icon-duplicate', :disabled => !@can[:copy] %></li>
             <% end %>
-              <li><%= context_menu_link l(:button_copy), new_issue_move_path(:ids => @issues.collect(&:id), :copy_options => {:copy => 't'}),
+              <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :copy => '1'},
                                       :class => 'icon-copy', :disabled => !@can[:move]  %></li>
               <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back),
                                         :method => :delete, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>

             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
             <%= watcher_tag(@issue, User.current) %>
             <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
-            <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
+            <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :id => @issue, :copy => '1'}, :class => 'icon icon-copy' %>
             <%= link_to l(:button_delete), issue_path(@issue), :confirm => issues_destroy_confirmation_message(@issue), :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
             </div>

-            <h2><%= l(:label_bulk_edit_selected_issues) %></h2>
+            <h2><%= @copy ? l(:button_copy) : l(:label_bulk_edit_selected_issues) %></h2>
             <ul><%= @issues.collect {|i|
                         content_tag('li',
             </div>
             <p>
-            	<% if @target_project %>
+            	<% if @copy %>
+            	  <%= hidden_field_tag 'copy', '1' %>
+            	  <%= submit_tag l(:button_copy) %>
+            	  <%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
+            	<% elsif @target_project %>
             	  <%= submit_tag l(:button_move) %>
             	  <%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
             	<% else %>

                 end
               end
-              map.resources :issue_moves, :only => [:new, :create],
-                            :path_prefix => '/issues', :as => 'move'
               # Misc issue routes. TODO: move into resources
               map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes',
                                        :action => 'issues', :conditions => { :method => :get }

                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
-                map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
+                map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member

                                         :attributes => { :href => '/projects/ecookbook/issues/1/copy',
                                                          :class => 'icon-duplicate' }
                 assert_tag :tag => 'a', :content => 'Copy',
-                                        :attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&amp;ids%5B%5D=1',
+                                        :attributes => { :href => '/issues/bulk_edit?copy=1&amp;ids%5B%5D=1',
                                                          :class => 'icon-copy' }
                 assert_no_tag :tag => 'a', :content => 'Move'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=3",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
-                                        :attributes => { :href => "/issues/move/new?copy_options%5Bcopy%5D=t&amp;#{ids}",
+                                        :attributes => { :href => "/issues/bulk_edit?copy=1&amp;#{ids}",
                                                          :class => 'icon-copy' }
                 assert_no_tag :tag => 'a', :content => 'Move'
                 assert_tag :tag => 'a', :content => 'Delete',

@@ -2319,6 +2319,87 class IssuesControllerTest < ActionController::TestCase
2319	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier	2319	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
2320	end	2320	end
2321		2321
		2322	def test_bulk_copy_to_another_project
		2323	@request.session[:user_id] = 2
		2324	assert_difference 'Issue.count', 2 do
		2325	assert_no_difference 'Project.find(1).issues.count' do
		2326	post :bulk_update, :ids => [1, 2], :issue => {:project_id => '2'}, :copy => '1'
		2327	end
		2328	end
		2329	assert_redirected_to '/projects/ecookbook/issues'
		2330	end
		2331
		2332	def test_bulk_copy_should_allow_not_changing_the issue_attributes
		2333	@request.session[:user_id] = 2
		2334	issue_before_move = Issue.find(1)
		2335	assert_difference 'Issue.count', 1 do
		2336	assert_no_difference 'Project.find(1).issues.count' do
		2337	post :bulk_update, :ids => [1], :copy => '1',
		2338	:issue => {
		2339	:project_id => '2', :tracker_id => '', :assigned_to_id => '',
		2340	:status_id => '', :start_date => '', :due_date => ''
		2341	}
		2342	end
		2343	end
		2344	issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
		2345	assert_equal issue_before_move.tracker_id, issue_after_move.tracker_id
		2346	assert_equal issue_before_move.status_id, issue_after_move.status_id
		2347	assert_equal issue_before_move.assigned_to_id, issue_after_move.assigned_to_id
		2348	end
		2349
		2350	def test_bulk_copy_should_allow_changing_the_issue_attributes
		2351	# Fixes random test failure with Mysql
		2352	# where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
		2353	# doesn't return the expected results
		2354	Issue.delete_all("project_id=2")
		2355
		2356	@request.session[:user_id] = 2
		2357	assert_difference 'Issue.count', 2 do
		2358	assert_no_difference 'Project.find(1).issues.count' do
		2359	post :bulk_update, :ids => [1, 2], :copy => '1',
		2360	:issue => {
		2361	:project_id => '2', :tracker_id => '', :assigned_to_id => '4',
		2362	:status_id => '3', :start_date => '2009-12-01', :due_date => '2009-12-31'
		2363	}
		2364	end
		2365	end
		2366
		2367	copied_issues = Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
		2368	assert_equal 2, copied_issues.size
		2369	copied_issues.each do \|issue\|
		2370	assert_equal 2, issue.project_id, "Project is incorrect"
		2371	assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
		2372	assert_equal 3, issue.status_id, "Status is incorrect"
		2373	assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
		2374	assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
		2375	end
		2376	end
		2377
		2378	def test_bulk_copy_should_allow_adding_a_note
		2379	@request.session[:user_id] = 2
		2380	assert_difference 'Issue.count', 1 do
		2381	post :bulk_update, :ids => [1], :copy => '1',
		2382	:notes => 'Copying one issue',
		2383	:issue => {
		2384	:project_id => '', :tracker_id => '', :assigned_to_id => '4',
		2385	:status_id => '3', :start_date => '2009-12-01', :due_date => '2009-12-31'
		2386	}
		2387	end
		2388
		2389	issue = Issue.first(:order => 'id DESC')
		2390	assert_equal 1, issue.journals.size
		2391	journal = issue.journals.first
		2392	assert_equal 0, journal.details.size
		2393	assert_equal 'Copying one issue', journal.notes
		2394	end
		2395
		2396	def test_bulk_copy_to_another_project_should_follow_when_needed
		2397	@request.session[:user_id] = 2
		2398	post :bulk_update, :ids => [1], :copy => '1', :issue => {:project_id => 2}, :follow => '1'
		2399	issue = Issue.first(:order => 'id DESC')
		2400	assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
		2401	end
		2402
2322	def test_destroy_issue_with_no_time_entries	2403	def test_destroy_issue_with_no_time_entries
2323	assert_nil TimeEntry.find_by_issue_id(2)	2404	assert_nil TimeEntry.find_by_issue_id(2)
2324	@request.session[:user_id] = 2	2405	@request.session[:user_id] = 2