jro_apps/redmine Commit - r896:e2c606e97459

Fixed: Update of time entry fails when the issue has been moved to an other project....

Jean-Philippe Lang -

r896:e2c606e97459

parent child

Context file:

r896:e2c606e97459

Collapse all files

app/controllers/projects_controller.rb +10 -17

                   # admin is allowed to move issues to any active (visible) project
                   @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
                 else
-                  User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:controller => 'projects', :action => 'move_issues')}
+                  User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? && params[:new_project_id] && @projects.collect(&:id).include?(params[:new_project_id].to_i) && params[:new_tracker_id]
                   new_project = Project.find_by_id(params[:new_project_id])
-                  new_tracker = Tracker.find_by_id(params[:new_tracker_id])
+                  new_tracker = params[:new_tracker_id].blank? ? nil : Tracker.find_by_id(params[:new_tracker_id])
-                  @issues.each do |i|
+                  unsaved_issue_ids = []
-                    if new_project && i.project_id != new_project.id
+                  @issues.each do |issue|
-                      # issue is moved to another project
+                    unsaved_issue_ids << issue.id unless issue.move_to(new_project, new_tracker)
-                      i.category = nil
+                  end
-                      i.fixed_version = nil
+                  if unsaved_issue_ids.empty?
-                      # delete issue relations
+                    flash[:notice] = l(:notice_successful_update) unless @issues.empty?
-                      i.relations_from.clear
+                  else
-                      i.relations_to.clear
+                    flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
-                      i.project = new_project
-                    end
-                    if new_tracker
-                      i.tracker = new_tracker
-                    end
-                    i.save
                   end
-                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                 end
               end

app/models/issue.rb +26 0

@@ -61,6 +61,32 class Issue < ActiveRecord::Base
61	self	61	self
62	end	62	end
63		63
		64	# Move an issue to a new project and tracker
		65	def move_to(new_project, new_tracker = nil)
		66	transaction do
		67	if new_project && project_id != new_project.id
		68	# delete issue relations
		69	self.relations_from.clear
		70	self.relations_to.clear
		71	# issue is moved to another project
		72	self.category = nil
		73	self.fixed_version = nil
		74	self.project = new_project
		75	end
		76	if new_tracker
		77	self.tracker = new_tracker
		78	end
		79	if save
		80	# Manually update project_id on related time entries
		81	TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
		82	else
		83	rollback_db_transaction
		84	return false
		85	end
		86	end
		87	return true
		88	end
		89
64	def priority_id=(pid)	90	def priority_id=(pid)
65	self.priority = nil	91	self.priority = nil
66	write_attribute(:priority_id, pid)	92	write_attribute(:priority_id, pid)

app/views/issues/index.rhtml +1 -1

                                    { :url => { :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
-                                   }, :class => 'icon icon-edit' %>
+                                   }, :class => 'icon icon-checked' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => { :set_filter => 1 },

public/images/true.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/unit/issue_test.rb +12 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class IssueTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values
+              fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
               def test_category_based_assignment
                 issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
                 assert issue2.reload.closed?
                 assert issue3.reload.closed?
               end
+              def test_move_to_another_project
+                issue = Issue.find(1)
+                assert issue.move_to(Project.find(2))
+                issue.reload
+                assert_equal 2, issue.project_id
+                # Category removed
+                assert_nil issue.category
+                # Make sure time entries were move to the target project
+                assert_equal 2, issue.time_entries.first.project_id
+              end
             end

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