t#30200:update i18n devise

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index abae3f7..c0cd0cf 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,6 +1,7 @@
 class PanelsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  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
@@ -10,11 +11,11 @@ class PanelsController < ApplicationController
   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
 
@@ -25,9 +26,9 @@ class PanelsController < ApplicationController
 
     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
@@ -63,12 +64,12 @@ class PanelsController < ApplicationController
     respond_to do |format|
       format.html # new.html.erb
       format.js
-      format.json { render json: @panel }
+      format.json { render json: @panel.panel_elements_as_json }
     end
   end
 
   def edit
-    @panel = Panel.show(params[:id], @author)
+    @panel = Panel.edit(params[:id], @author)
     respond_to do |format|
       format.html
       format.js
@@ -80,16 +81,15 @@ class PanelsController < ApplicationController
   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
+      if @panel.store @prm, @author
         format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
-        format.json { render json: @panel, status: :created, location: @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 }
@@ -101,14 +101,13 @@ class PanelsController < ApplicationController
   # 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
+      if @panel.store @prm, @author
         format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
         format.json { head :ok }
       else
@@ -131,20 +130,4 @@ class PanelsController < ApplicationController
     end
   end
   
-  def move
-    @panel = Panel.find(params[:id])
-    @new_seq = params[:panel][:t].to_i
-    respond_to do |format|
-      Panel.transaction do
-        if @panel.move_to(@new_t)
-          format.html { redirect_to @panel, notice: 'Panel was successfully moved.' }
-          format.json { head :ok }
-        else
-          format.html { render action: "show" }
-          format.json { render json: @panel.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-  end
-  
 end