Handle unsuccessful destroys in TimelogController. #5700

Contributed by Jan git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 19:30:51 +00:00
parent acef1d5352
commit c98f46d691
4 changed files with 25 additions and 2 deletions
@@ -225,8 +225,11 @@ class TimelogController < ApplicationController
  def destroy
    (render_404; return) unless @time_entry
    (render_403; return) unless @time_entry.editable_by?(User.current)
-    @time_entry.destroy
-    flash[:notice] = l(:notice_successful_delete)
+    if @time_entry.destroy && @time_entry.destroyed?
+      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