jro_apps/redmine Commit - r3691:c98f46d69154

Handle unsuccessful destroys in TimelogController. #5700...

Eric Davis -

r3691:c98f46d69154

parent child

Context file:

r3691:c98f46d69154

app/controllers/timelog_controller.rb +5 -2

               def destroy
                 (render_404; return) unless @time_entry
                 (render_403; return) unless @time_entry.editable_by?(User.current)
-                @time_entry.destroy
+                if @time_entry.destroy && @time_entry.destroyed?
-                flash[:notice] = l(:notice_successful_delete)
+                  flash[:notice] = l(:notice_successful_delete)
+                else
+                  flash[:error] = l(:notice_unable_delete_time_entry)
+                end
                 redirect_to :back
               rescue ::ActionController::RedirectBackError
                 redirect_to :action => 'details', :project_id => @time_entry.project

config/locales/de.yml +1 0

               notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
               notice_default_data_loaded: Die Standard-Konfiguration wurde erfolgreich geladen.
               notice_unable_delete_version: Die Version konnte nicht gelöscht werden.
+              notice_unable_delete_time_entry: Der Zeiterfassungseintrag konnte nicht gelöscht werden.
               notice_issue_done_ratios_updated: Der Ticket-Fortschritt wurde aktualisiert.
               error_can_t_load_default_data: "Die Standard-Konfiguration konnte nicht geladen werden: {{value}}"

config/locales/en.yml +1 0

               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
+              notice_unable_delete_time_entry: Unable to delete time log entry.
               notice_issue_done_ratios_updated: Issue done ratios updated.
               error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"

test/functional/timelog_controller_test.rb +18 0

@@ -116,9 +116,27 class TimelogControllerTest < ActionController::TestCase
116	@request.session[:user_id] = 2	116	@request.session[:user_id] = 2
117	post :destroy, :id => 1	117	post :destroy, :id => 1
118	assert_redirected_to :action => 'details', :project_id => 'ecookbook'	118	assert_redirected_to :action => 'details', :project_id => 'ecookbook'
		119	assert_equal I18n.t(:notice_successful_delete), flash[:notice]
119	assert_nil TimeEntry.find_by_id(1)	120	assert_nil TimeEntry.find_by_id(1)
120	end	121	end
121		122
		123	def test_destroy_should_fail
		124	# simulate that this fails (e.g. due to a plugin), see #5700
		125	TimeEntry.class_eval do
		126	before_destroy :stop_callback_chain
		127	def stop_callback_chain ; return false ; end
		128	end
		129
		130	@request.session[:user_id] = 2
		131	post :destroy, :id => 1
		132	assert_redirected_to :action => 'details', :project_id => 'ecookbook'
		133	assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
		134	assert_not_nil TimeEntry.find_by_id(1)
		135
		136	# remove the simulation
		137	TimeEntry.before_destroy.reject! {\|callback\| callback.method == :stop_callback_chain }
		138	end
		139
122	def test_report_no_criteria	140	def test_report_no_criteria
123	get :report, :project_id => 1	141	get :report, :project_id => 1
124	assert_response :success	142	assert_response :success

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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