client is version 0.5.41, fixed Finder.ApplicationButton

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 29390ce..ebbb8ba 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,33 +1,35 @@
 class PanelsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
-  before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+  layout 'test' if MagicNumber['test_layout']
+  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_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+  end
   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]
-    @panels = Panel.list({}, @page, @page_size)
+    @panels = Panel.list(@page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panels.to_json(Panel.list_json_opt) }
+      format.json { render text: Panel.list_as_json_text(@panels) }
     end
   end
 
-  # GET /panels/1
-  # GET /panels/1.json
   def show
     @panel = Panel.show(params[:id], @author)
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @panel.to_json(Panel.show_json_include_opt) }
+      format.json { render json: @panel.panel_elements_as_json }
       format.jsonp {
-        render :json => "callback(" + @panel.to_json(Panel.show_json_include_opt) + ");"
+        render :json => "callback(" + @panel.panel_elements_as_json + ");"
       }
     end
   end
@@ -61,9 +63,9 @@ 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 }
+      format.json { render json: @panel.panel_elements_as_json }
     end
   end
 
@@ -75,21 +77,19 @@ class PanelsController < ApplicationController
     end
   end
 
-  # POST /panels
-  # POST /panels.json
   def create
     @panel = Panel.new
     @panel.supply_default
+    jsn = nil
     if params[:json]
-      jsn = JSON.parse(params[:json])
+      jsn = JSON.parse_no_except(params[:json])
     end
     @prm = params[:panel] || jsn
-    @panel.attributes = @prm
-    @panel.overwrite @author
     respond_to do |format|
-      if @panel.store
-        format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
-        format.json { render json: @panel, status: :created, location: @panel }
+      if @panel.store @prm, @author
+        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" }
         format.json { render json: @panel.errors, status: :unprocessable_entity }
@@ -97,19 +97,17 @@ class PanelsController < ApplicationController
     end
   end
 
-  # PUT /panels/1
-  # PUT /panels/1.json
   def update
     @panel = Panel.edit(params[:id], @author)
+    jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:panel] || jsn
-    @panel.attributes = @prm
-    @panel.overwrite @author
     respond_to do |format|
-      if @panel.store
-        format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
+      if @panel.store @prm, @author
+        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" }
@@ -118,15 +116,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