Report validation failures without the exception preamble

2 files changed, 6 insertions, 5 deletions

diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 03780c69..801e0968 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -94,7 +94,7 @@ class AssetsController < ApplicationController
       format.xml  { head :ok }
     end
   rescue ActiveRecord::RecordInvalid => e
-    flash[:error] = e.message
+    flash[:error] = e.record.errors.full_messages.to_sentence
     respond_to do |format|
       format.html { redirect_to(asset_path(@asset)) }
       format.xml  { head :forbidden }
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 383fb72c..ca30976f 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -163,7 +163,7 @@ class NodesController < ApplicationController
     flash[:error] = t("flash.common.locked_by_other")
     redirect_to node_path(@node)
   rescue ActiveRecord::RecordInvalid => e
-    flash[:error] = e.message
+    flash[:error] = e.record.errors.full_messages.to_sentence
     redirect_to node_path(@node)
   end
 
@@ -176,7 +176,7 @@ class NodesController < ApplicationController
     flash[:error] = t("flash.nodes.restore_target_missing")
     redirect_to node_path(@node)
   rescue ActiveRecord::RecordInvalid => e
-    flash[:error] = e.message
+    flash[:error] = e.record.errors.full_messages.to_sentence
     redirect_to node_path(@node)
   end
 
@@ -186,7 +186,8 @@ class NodesController < ApplicationController
     redirect_to trashed_nodes_path
 
   rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotDestroyed => e
-    flash[:error] = e.message
+    messages = e.record.errors.full_messages
+    flash[:error] = messages.any? ? messages.to_sentence : e.message
     redirect_to node_path(@node)
   end
 
@@ -195,7 +196,7 @@ class NodesController < ApplicationController
     flash[:notice] = t("flash.nodes.published")
     redirect_to node_path(@node)
   rescue ActiveRecord::RecordInvalid => e
-    flash[:error] = e.message
+    flash[:error] = e.record.errors.full_messages.to_sentence
     redirect_to node_path(@node)
   end