diff options
| -rw-r--r-- | app/controllers/application_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/timelog_controller.rb | 30 |
2 files changed, 21 insertions, 17 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 24b45f6ac..bf62d7ff2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -507,8 +507,12 @@ class ApplicationController < ActionController::Base end # Renders API response on validation failure - def render_validation_errors(object) - @error_messages = object.errors.full_messages + def render_validation_errors(objects) + if objects.is_a?(Array) + @error_messages = objects.map {|object| object.errors.full_messages}.flatten + else + @error_messages = objects.errors.full_messages + end render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => false end diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 2feb129e2..d6d1911e7 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -199,30 +199,30 @@ class TimelogController < ApplicationController end def destroy - @time_entries.each do |t| - begin + destroyed = TimeEntry.transaction do + @time_entries.each do |t| unless t.destroy && t.destroyed? - respond_to do |format| - format.html { - flash[:error] = l(:notice_unable_delete_time_entry) - redirect_to :back - } - format.api { render_validation_errors(t) } - end - return + raise ActiveRecord::Rollback end - rescue ::ActionController::RedirectBackError - redirect_to :action => 'index', :project_id => @projects.first - return end end respond_to do |format| format.html { - flash[:notice] = l(:notice_successful_delete) + if destroyed + flash[:notice] = l(:notice_successful_delete) + else + flash[:error] = l(:notice_unable_delete_time_entry) + end redirect_back_or_default(:action => 'index', :project_id => @projects.first) } - format.api { head :ok } + format.api { + if destroyed + head :ok + else + render_validation_errors(@time_entries) + end + } end end |