t#:31222

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index c2bc788..2804bad 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,7 +1,13 @@
 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]
+  if MagicNumber['run_mode'] == 0
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+  else
+    before_filter :authenticate_reader, :only => [:index, :show]
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+  end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   public
@@ -14,11 +20,13 @@ class PanelsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render text: Panel.list_as_json_text(@panels) }
+      format.atom 
+      format.rss { render :layout => false }
     end
   end
 
   def show
-    @panel = Panel.show(params[:id], @author)
+    @panel = Panel.show(params[:id], [@user, @admin])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -58,7 +66,7 @@ class PanelsController < ApplicationController
     @panel.supply_default
 
     respond_to do |format|
-      format.html # new.html.erb
+      format.html { render layout: 'metro' }
       format.js
       format.json { render json: @panel.panel_elements_as_json }
     end
@@ -115,9 +123,15 @@ class PanelsController < ApplicationController
     @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