jro_apps/redmine Commit - r15736:987ca8cc2af0

Handle time entries on subtasks and prevent from reassigning an issue that is going to be deleted (#24718, #24693)....

Jean-Philippe Lang -

r15736:987ca8cc2af0

parent child

Context file:

r15736:987ca8cc2af0

Collapse all files

app/controllers/issues_controller.rb +11 -4

               def destroy
                 raise Unauthorized unless @issues.all?(&:deletable?)
-                @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
+                # all issues and their descendants are about to be deleted
+                issues_and_descendants_ids = Issue.self_and_descendants(@issues).pluck(:id)
+                time_entries = TimeEntry.where(:issue_id => issues_and_descendants_ids)
+                @hours = time_entries.sum(:hours).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
-                    TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
+                    time_entries.update_all(:issue_id => nil)
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
+                    elsif issues_and_descendants_ids.include?(reassign_to.id)
+                      flash.now[:error] = l(:error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted)
+                      return
                     else
-                      TimeEntry.where(['issue_id IN (?)', @issues]).
+                      time_entries.update_all(:issue_id => reassign_to.id)
-                        update_all("issue_id = #{reassign_to.id}")
                     end
                   else
                     # display the destroy form if it's a user request

app/models/issue.rb +9 0

@@ -1102,6 +1102,15 class Issue < ActiveRecord::Base
1102	end	1102	end
1103	end	1103	end
1104		1104
		1105	# Returns a scope of the given issues and their descendants
		1106	def self.self_and_descendants(issues)
		1107	issue_ids = Issue.joins("JOIN #{Issue.table_name} ancestors" +
		1108	" ON ancestors.root_id = #{Issue.table_name}.root_id" +
		1109	" AND ancestors.lft <= #{Issue.table_name}.lft AND ancestors.rgt >= #{Issue.table_name}.rgt"
		1110	).
		1111	where(:ancestors => {:id => issues.map(&:id)})
		1112	end
		1113
1105	# Finds an issue relation given its id.	1114	# Finds an issue relation given its id.
1106	def find_relation(relation_id)	1115	def find_relation(relation_id)
1107	IssueRelation.where("issue_to_id = ? OR issue_from_id = ?", id, id).find(relation_id)	1116	IssueRelation.where("issue_to_id = ? OR issue_from_id = ?", id, id).find(relation_id)

config/locales/en.yml +1 0

               error_no_tracker_allowed_for_new_issue_in_project: "The project doesn't have any trackers for which you can create an issue"
               error_no_projects_with_tracker_allowed_for_new_issue: "There are no projects with trackers for which you can create an issue"
               error_move_of_child_not_possible: "Subtask %{child} could not be moved to the new project: %{errors}"
+              error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Spent time cannot be reassigned to an issue that is about to be deleted"
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'

config/locales/fr.yml +1 0

               error_no_tracker_allowed_for_new_issue_in_project: "Le projet ne dispose d'aucun tracker sur lequel vous pouvez créer une demande"
               error_no_projects_with_tracker_allowed_for_new_issue: "Aucun projet ne dispose d'un tracker sur lequel vous pouvez créer une demande"
               error_move_of_child_not_possible: "La sous-tâche %{child} n'a pas pu être déplacée dans le nouveau projet : %{errors}"
+              error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Le temps passé ne peut pas être réaffecté à une demande qui va être supprimée"
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'

test/functional/issues_controller_test.rb +46 -2

@@ -4609,7 +4609,7 class IssuesControllerTest < Redmine::ControllerTest
4609	assert_response :success	4609	assert_response :success
4610	end	4610	end
4611		4611
4612	def test_destroy_issue_with_no_time_entries	4612	def test_destroy_issue_with_no_time_entries_should_delete_the_issues
4613	assert_nil TimeEntry.find_by_issue_id(2)	4613	assert_nil TimeEntry.find_by_issue_id(2)
4614	@request.session[:user_id] = 2	4614	@request.session[:user_id] = 2
4615		4615
@@ -4620,7 +4620,7 class IssuesControllerTest < Redmine::ControllerTest
4620	assert_nil Issue.find_by_id(2)	4620	assert_nil Issue.find_by_id(2)
4621	end	4621	end
4622		4622
4623	def test_destroy_issues_with_time_entries	4623	def test_destroy_issues_with_time_entries_should_show_the_reassign_form
4624	@request.session[:user_id] = 2	4624	@request.session[:user_id] = 2
4625		4625
4626	assert_no_difference 'Issue.count' do	4626	assert_no_difference 'Issue.count' do
@@ -4633,6 +4633,20 class IssuesControllerTest < Redmine::ControllerTest
4633	end	4633	end
4634	end	4634	end
4635		4635
		4636	def test_destroy_issues_with_time_entries_should_show_hours_on_issues_and_descendants
		4637	parent = Issue.generate_with_child!
		4638	TimeEntry.generate!(:issue => parent)
		4639	TimeEntry.generate!(:issue => parent.children.first)
		4640	leaf = Issue.generate!
		4641	TimeEntry.generate!(:issue => leaf)
		4642	@request.session[:user_id] = 2
		4643
		4644	delete :destroy, :ids => [parent.id, leaf.id]
		4645	assert_response :success
		4646
		4647	assert_select 'p', :text => /3\.00 hours were reported/
		4648	end
		4649
4636	def test_destroy_issues_and_destroy_time_entries	4650	def test_destroy_issues_and_destroy_time_entries
4637	@request.session[:user_id] = 2	4651	@request.session[:user_id] = 2
4638		4652
@@ -4674,6 +4688,24 class IssuesControllerTest < Redmine::ControllerTest
4674	assert_equal 2, TimeEntry.find(2).issue_id	4688	assert_equal 2, TimeEntry.find(2).issue_id
4675	end	4689	end
4676		4690
		4691	def test_destroy_issues_with_time_entries_should_reassign_time_entries_of_issues_and_descendants
		4692	parent = Issue.generate_with_child!
		4693	TimeEntry.generate!(:issue => parent)
		4694	TimeEntry.generate!(:issue => parent.children.first)
		4695	leaf = Issue.generate!
		4696	TimeEntry.generate!(:issue => leaf)
		4697	target = Issue.generate!
		4698	@request.session[:user_id] = 2
		4699
		4700	assert_difference 'Issue.count', -3 do
		4701	assert_no_difference 'TimeEntry.count' do
		4702	delete :destroy, :ids => [parent.id, leaf.id], :todo => 'reassign', :reassign_to_id => target.id
		4703	assert_response 302
		4704	end
		4705	end
		4706	assert_equal 3, target.time_entries.count
		4707	end
		4708
4677	def test_destroy_issues_and_reassign_time_entries_to_an_invalid_issue_should_fail	4709	def test_destroy_issues_and_reassign_time_entries_to_an_invalid_issue_should_fail
4678	@request.session[:user_id] = 2	4710	@request.session[:user_id] = 2
4679		4711
@@ -4686,6 +4718,18 class IssuesControllerTest < Redmine::ControllerTest
4686	assert_response :success	4718	assert_response :success
4687	end	4719	end
4688		4720
		4721	def test_destroy_issues_and_reassign_time_entries_to_an_issue_to_delete_should_fail
		4722	@request.session[:user_id] = 2
		4723
		4724	assert_no_difference 'Issue.count' do
		4725	assert_no_difference 'TimeEntry.count' do
		4726	delete :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 3
		4727	end
		4728	end
		4729	assert_response :success
		4730	assert_select '#flash_error', :text => I18n.t(:error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted)
		4731	end
		4732
4689	def test_destroy_issues_from_different_projects	4733	def test_destroy_issues_from_different_projects
4690	@request.session[:user_id] = 2	4734	@request.session[:user_id] = 2
4691		4735

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