news controller reorganized display validation errors

Author: Trim

app/controllers/redaction/news_controller.rb

@@ -65,8 +65,12 @@ def reorganize
 
   def reorganized
     @news.editor = current_account
-    @news.reorganize news_params
-    redirect_to [@news.draft? ? :redaction : :moderation, @news]
+    if @news.reorganize news_params
+      redirect_to [@news.draft? ? :redaction : :moderation, @news]
+    else
+      load_board
+      render :reorganize, layout: "chat_n_edit"
+    end
   end
 
   def followup

app/models/news.rb

@@ -260,14 +260,20 @@ def nb_editors
   end
 
   def reorganize(params)
+    reorganized = false
     self.transaction do
       Paragraph.where(news_id: self.id).delete_all
       self.attributes = params
       create_parts
       # Let commit transaction only if save is successful so version will be well created
-      raise ActiveRecord::Rollback unless save
+      if save
+        reorganized = true
+      else
+        raise ActiveRecord::Rollback
+      end
     end
-    unlock
+    unlock if reorganized
+    reorganized
   end
 
 ### Associated node ###

app/views/redaction/news/reorganize.html.haml

@@ -9,6 +9,7 @@
 = render 'topbar', news: @news, show_backlink: false
 
 %article
+  = messages_on_error @news
   = form_for @news, url: reorganized_redaction_news_path(@news), method: :put do |form|
     %p
       = form.label :section_id, "Section"