t30350#:fix destroy

[pettanr/pettanr.git] / app / controllers / panels_controller.rb

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 544ecc0..7d5e4e6 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,12 +1,11 @@
 class PanelsController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+  before_filter :authenticate_author, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   public
   
-  # GET /panels
-  # GET /panels.json
   def index
     @page = Panel.page params[:page]
     @page_size = Panel.page_size params[:page_size]
@@ -18,8 +17,6 @@ class PanelsController < ApplicationController
     end
   end
 
-  # GET /panels/1
-  # GET /panels/1.json
   def show
     @panel = Panel.show(params[:id], @author)
 
@@ -75,8 +72,6 @@ class PanelsController < ApplicationController
     end
   end
 
-  # POST /panels
-  # POST /panels.json
   def create
     @panel = Panel.new
     @panel.supply_default
@@ -87,7 +82,8 @@ class PanelsController < ApplicationController
     @prm = params[:panel] || jsn
     respond_to do |format|
       if @panel.store @prm, @author
-        format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
+        flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
+        format.html { redirect_to @panel }
         format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
       else
         format.html { render action: "new" }
@@ -96,8 +92,6 @@ class PanelsController < ApplicationController
     end
   end
 
-  # PUT /panels/1
-  # PUT /panels/1.json
   def update
     @panel = Panel.edit(params[:id], @author)
     jsn = nil
@@ -107,7 +101,8 @@ class PanelsController < ApplicationController
     @prm = params[:panel] || jsn
     respond_to do |format|
       if @panel.store @prm, @author
-        format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
+        flash[:notice] = I18n.t('flash.notice.updated', :model => Panel.model_name.human)
+        format.html { redirect_to @panel }
         format.json { head :ok }
       else
         format.html { render action: "edit" }
@@ -116,15 +111,19 @@ class PanelsController < ApplicationController
     end
   end
 
-  # DELETE /panels/1
-  # DELETE /panels/1.json
   def destroy
     @panel = Panel.edit(params[:id], @author)
     respond_to do |format|
       Panel.transaction do
-        @panel.destroy
-        format.html { redirect_to panels_url }
-        format.json { head :ok }
+        if @panel.destroy_with_elements
+          flash[:notice] = I18n.t('flash.notice.destroyed', :model => Panel.model_name.human)
+          format.html { redirect_to '/home/panel' }
+          format.json { head :ok }
+        else
+          flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Panel.model_name.human)
+          format.html { redirect_to @panel }
+          format.json { render json: @panel.errors, status: :unprocessable_entity }
+        end
       end
     end
   end