jro_apps/redmine Commit - r8432:121bc44cc504

Use the regular issue form to copy a single issue....

Jean-Philippe Lang -

r8432:121bc44cc504

parent child

Context file:

r8432:121bc44cc504

Collapse all files

app/controllers/issues_controller.rb +1 -1

                     format.html {
                       render_attachment_warning_if_needed(@issue)
                       flash[:notice] = l(:notice_issue_successful_create, :id => "<a href='#{issue_path(@issue)}'>##{@issue.id}</a>")
-                      redirect_to(params[:continue] ?  { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
+                      redirect_to(params[:continue] ?  { :action => 'new', :project_id => @issue.project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
                                   { :action => 'show', :id => @issue })
                     }
                     format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }

app/models/issue.rb +10 -1

                 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : []
               end
+              # Copies attributes from another issue, arg can be an id or an Issue
               def copy_from(arg)
                 issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
                 self.attributes = issue.attributes.dup.except("id", "root_id", "parent_id", "lft", "rgt", "created_on", "updated_on")
                 self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                 self.status = issue.status
                 self.author = User.current
+                @copied_from = issue
                 self
               end
                 copy
               end
+              # Returns true if the issue is a copy
+              def copy?
+                @copied_from.present?
+              end
               # Moves/copies an issue to a new project and tracker
               # Returns the moved/copied issue on success, false on failure
               def move_to_project(new_project, new_tracker=nil, options={})
               safe_attributes 'project_id',
                 :if => lambda {|issue, user|
-                  if user.allowed_to?(:move_issues, issue.project)
+                  if issue.new_record?
+                    issue.copy?
+                  elsif user.allowed_to?(:move_issues, issue.project)
                     projects = Issue.allowed_target_projects_on_move(user)
                     projects.include?(issue.project) && projects.size > 1
                   end

app/views/context_menus/issues.html.erb +5 -4

             <% end %>
             <% if @issue.present? %>
-              <li><%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
+              <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
-                      :class => 'icon-duplicate', :disabled => !@can[:copy] %></li>
+                      :class => 'icon-copy', :disabled => !@can[:copy] %></li>
-            <% end %>
+            <% else %>
               <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>
+                                      :class => 'icon-copy', :disabled => !@can[:move] %></li>
+            <% end %>
               <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>

app/views/issues/_action_menu.html.erb +1 -2

             <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
             <%= 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 => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, :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>

app/views/issues/_form.html.erb +1 -1

             </p>
             <% end %>
-            <% if !@issue.new_record? && @issue.safe_attribute?('project_id') %>
+            <% if @issue.safe_attribute? 'project_id' %>
             <p><%= f.select :project_id, project_tree_options_for_select(Issue.allowed_target_projects_on_move, :selected => @issue.project), :required => true %></p>
             <%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue, :project_change => '1'),
                                                  :with => "Form.serialize('issue-form')" %>

app/views/issues/new.html.erb +3 0

             <% labelled_form_for @issue, :url => project_issues_path(@project),
                                          :html => {:id => 'issue-form', :multipart => true} do |f| %>
               <%= error_messages_for 'issue' %>
+            	<%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
               <div class="box tabular">
+              	<div id="all_attributes">
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
+                </div>
                 <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>

test/functional/context_menus_controller_test.rb +1 -4

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

test/functional/issues_controller_test.rb +51 -1

@@ -1571,13 +1571,63 class IssuesControllerTest < ActionController::TestCase
1571	end	1571	end
1572	end	1572	end
1573		1573
1574	def test_copy~~_issue~~	1574	def test_new_as_copy
1575	@request.session[:user_id] = 2	1575	@request.session[:user_id] = 2
1576	get :new, :project_id => 1, :copy_from => 1	1576	get :new, :project_id => 1, :copy_from => 1
		1577
		1578	assert_response :success
1577	assert_template 'new'	1579	assert_template 'new'
		1580
1578	assert_not_nil assigns(:issue)	1581	assert_not_nil assigns(:issue)
1579	orig = Issue.find(1)	1582	orig = Issue.find(1)
		1583	assert_equal 1, assigns(:issue).project_id
1580	assert_equal orig.subject, assigns(:issue).subject	1584	assert_equal orig.subject, assigns(:issue).subject
		1585	assert assigns(:issue).copy?
		1586
		1587	assert_tag 'form', :attributes => {:id => 'issue-form', :action => '/projects/ecookbook/issues'}
		1588	assert_tag 'select', :attributes => {:name => 'issue[project_id]'}
		1589	assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
		1590	:child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}, :content => 'eCookbook'}
		1591	assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
		1592	:child => {:tag => 'option', :attributes => {:value => '2', :selected => nil}, :content => 'OnlineStore'}
		1593	assert_tag 'input', :attributes => {:name => 'copy_from', :value => '1'}
		1594	end
		1595
		1596	def test_create_as_copy_on_different_project
		1597	@request.session[:user_id] = 2
		1598	assert_difference 'Issue.count' do
		1599	post :create, :project_id => 1, :copy_from => 1,
		1600	:issue => {:project_id => '2', :tracker_id => '3', :status_id => '1', :subject => 'Copy'}
		1601
		1602	assert_not_nil assigns(:issue)
		1603	assert assigns(:issue).copy?
		1604	end
		1605	issue = Issue.first(:order => 'id DESC')
		1606	assert_redirected_to "/issues/#{issue.id}"
		1607
		1608	assert_equal 2, issue.project_id
		1609	assert_equal 3, issue.tracker_id
		1610	assert_equal 'Copy', issue.subject
		1611	end
		1612
		1613	def test_create_as_copy_with_failure
		1614	@request.session[:user_id] = 2
		1615	post :create, :project_id => 1, :copy_from => 1,
		1616	:issue => {:project_id => '2', :tracker_id => '3', :status_id => '1', :subject => ''}
		1617
		1618	assert_response :success
		1619	assert_template 'new'
		1620
		1621	assert_not_nil assigns(:issue)
		1622	assert assigns(:issue).copy?
		1623
		1624	assert_tag 'form', :attributes => {:id => 'issue-form', :action => '/projects/ecookbook/issues'}
		1625	assert_tag 'select', :attributes => {:name => 'issue[project_id]'}
		1626	assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
		1627	:child => {:tag => 'option', :attributes => {:value => '1', :selected => nil}, :content => 'eCookbook'}
		1628	assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
		1629	:child => {:tag => 'option', :attributes => {:value => '2', :selected => 'selected'}, :content => 'OnlineStore'}
		1630	assert_tag 'input', :attributes => {:name => 'copy_from', :value => '1'}
1581	end	1631	end
1582		1632
1583	def test_get_edit	1633	def test_get_edit

test/unit/issue_test.rb +1 0

               def test_copy
                 issue = Issue.new.copy_from(1)
+                assert issue.copy?
                 assert issue.save
                 issue.reload
                 orig = Issue.find(1)

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