t#31537:fix flash

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 28bd0c1..dbcfab5 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -105,6 +105,7 @@ class ArtistsController < ApplicationController
         format.html { redirect_to root_path }
         format.json { render json: @ar.to_json(Artist.show_json_opt), status: :created, location: @artist }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Artist.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @ar.errors, status: :unprocessable_entity }
       end
@@ -124,6 +125,7 @@ class ArtistsController < ApplicationController
         format.html { redirect_to '/home/configure' }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Artist.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @ar.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index 1350c4d..dbd4778 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -171,6 +171,7 @@ class AuthorsController < ApplicationController
         format.html { redirect_to root_path }
         format.json { render json: @au.to_json(Author.show_json_opt), status: :created, location: @artist }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Author.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @au.errors, status: :unprocessable_entity }
       end
@@ -188,6 +189,7 @@ class AuthorsController < ApplicationController
         format.html { redirect_to '/home/configure' }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Author.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @au.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 848e4b2..c5f8546 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -90,6 +90,7 @@ class ComicsController < ApplicationController
         format.html { redirect_to @comic }
         format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Comic.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @comic.errors, status: :unprocessable_entity }
       end
@@ -106,6 +107,7 @@ class ComicsController < ApplicationController
         format.html { redirect_to @comic }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Comic.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @comic.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb
index 5b94a64..0652ea7 100644 (file)
--- a/app/controllers/ground_colors_controller.rb
+++ b/app/controllers/ground_colors_controller.rb
@@ -65,10 +65,12 @@ class GroundColorsController < ApplicationController
           format.html { redirect_to @panel }
           format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
         else
+          flash[:notice] = I18n.t('flash.notice.not_created', :model => Panel.model_name.human)
           format.html { render action: "panels/new" }
           format.json { render json: @panel.errors, status: :unprocessable_entity }
         end
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => GroundColor.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @ground_color.errors, status: :unprocessable_entity }
       end
@@ -87,6 +89,7 @@ class GroundColorsController < ApplicationController
         format.html { redirect_to @ground_color }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => GroundColor.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @ground_color.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/ground_pictures_controller.rb b/app/controllers/ground_pictures_controller.rb
index be166c4..dd8ebb6 100644 (file)
--- a/app/controllers/ground_pictures_controller.rb
+++ b/app/controllers/ground_pictures_controller.rb
@@ -63,10 +63,12 @@ class GroundPicturesController < ApplicationController
           format.html { redirect_to @panel }
           format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
         else
+          flash[:notice] = I18n.t('flash.notice.not_created', :model => Panel.model_name.human)
           format.html { render action: "panels/new" }
           format.json { render json: @panel.errors, status: :unprocessable_entity }
         end
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => GroundPicture.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @ground_picture.errors, status: :unprocessable_entity }
       end
@@ -85,6 +87,7 @@ class GroundPicturesController < ApplicationController
         format.html { redirect_to @ground_picture }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => GroundPicture.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @ground_picture.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index cfead9e..2d0b463 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -99,6 +99,7 @@ class OriginalPicturesController < ApplicationController
         format.html { redirect_to @original_picture }
         format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => OriginalPicture.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @original_picture.errors, status: :unprocessable_entity }
       end
@@ -120,6 +121,7 @@ class OriginalPicturesController < ApplicationController
         format.html { redirect_to @original_picture }
         format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => OriginalPicture.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @original_picture.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 91444ce..be237f5 100644 (file)
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -83,10 +83,12 @@ class PanelPicturesController < ApplicationController
           format.html { redirect_to @panel }
           format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
         else
+          flash[:notice] = I18n.t('flash.notice.not_created', :model => Panel.model_name.human)
           format.html { render action: "panels/new" }
           format.json { render json: @panel.errors, status: :unprocessable_entity }
         end
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => PanelPicture.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @panel_picture.errors, status: :unprocessable_entity }
       end
@@ -105,6 +107,7 @@ class PanelPicturesController < ApplicationController
         format.html { redirect_to @panel_picture }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => PanelPicture.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @panel_picture.errors, status: :unprocessable_entity }
       end

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 96a1fda..1baf428 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -102,6 +102,7 @@ class StoriesController < ApplicationController
         format.html { redirect_to action: :comic, id: @story.comic_id }
         format.json { render json: @story.story_as_json(@author) }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Story.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @story.errors, status: :unprocessable_entity }
       end
@@ -119,6 +120,7 @@ class StoriesController < ApplicationController
         format.html { redirect_to action: :comic, id: @story.comic_id }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Story.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @story.errors, status: :unprocessable_entity }
       end

diff --git a/app/views/authors/edit.html.erb b/app/views/authors/edit.html.erb
index c6fbf29..ea18093 100644 (file)
--- a/app/views/authors/edit.html.erb
+++ b/app/views/authors/edit.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t '.title' -%></h1>
+<p id="notice"><%= notice %></p>
 
 <%= render 'form', :au => @au %>
 

diff --git a/app/views/comics/edit.html.erb b/app/views/comics/edit.html.erb
index f33a2f8..1d67f75 100644 (file)
--- a/app/views/comics/edit.html.erb
+++ b/app/views/comics/edit.html.erb
@@ -1,3 +1,4 @@
 <h1><%= t('.title') %></h1>
+<p id="notice"><%= notice %></p>
 
 <%= render 'form' %>

diff --git a/app/views/ground_colors/edit.html.erb b/app/views/ground_colors/edit.html.erb
index 7fb5b02..e57ae15 100644 (file)
--- a/app/views/ground_colors/edit.html.erb
+++ b/app/views/ground_colors/edit.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t('.title') %></h1>
+<p id="notice"><%= notice %></p>
 
 <h2><%= t('home.index.catch') -%></h2>
 <%= render 'panels/standard', :panel => @panel, :author => @author %>

diff --git a/app/views/ground_pictures/edit.html.erb b/app/views/ground_pictures/edit.html.erb
index 7fb5b02..e57ae15 100644 (file)
--- a/app/views/ground_pictures/edit.html.erb
+++ b/app/views/ground_pictures/edit.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t('.title') %></h1>
+<p id="notice"><%= notice %></p>
 
 <h2><%= t('home.index.catch') -%></h2>
 <%= render 'panels/standard', :panel => @panel, :author => @author %>

diff --git a/app/views/original_pictures/edit.html.erb b/app/views/original_pictures/edit.html.erb
index 15957ef..a3fad92 100644 (file)
--- a/app/views/original_pictures/edit.html.erb
+++ b/app/views/original_pictures/edit.html.erb
@@ -1,3 +1,4 @@
 <h1><%= t '.title' -%></h1>\r
+<p id="notice"><%= notice %></p>\r
 \r
 <%= render 'form' %>\r

diff --git a/app/views/panel_pictures/edit.html.erb b/app/views/panel_pictures/edit.html.erb
index ec8963e..34469a8 100644 (file)
--- a/app/views/panel_pictures/edit.html.erb
+++ b/app/views/panel_pictures/edit.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t('.title') %></h1>
+<p id="notice"><%= notice %></p>
 
 <h2><%= t('home.index.catch') -%></h2>
 <%= render 'panels/standard', :panel => @panel, :author => @author %>

diff --git a/app/views/panels/edit.html.erb b/app/views/panels/edit.html.erb
index dd4f037..bc01cd6 100644 (file)
--- a/app/views/panels/edit.html.erb
+++ b/app/views/panels/edit.html.erb
@@ -1,4 +1,6 @@
 <h1><%= t '.title' -%></h1>
+<p id="notice"><%= notice %></p>
+
 <%= render 'standard', :panel => @panel, :author => @author %>
 <%= render 'form' %>
 <%= link_to t('link.destroy'), panel_path(@panel), :method => :delete %>

diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
index 1390df9..cee9463 100644 (file)
--- a/app/views/stories/edit.html.erb
+++ b/app/views/stories/edit.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t('.title') %></h1>
+<p id="notice"><%= notice %></p>
 
 <%= render 'form' %>
 <%= button_to 'Destroy', @story.panel, confirm: 'Are you sure?', method: :delete %>