X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fpanels_controller.rb;h=527fcf06fa7f6e8044911d7d496aa0555e710253;hp=175721d5b49109f8696e6704a0502506f947978e;hb=refs%2Fheads%2Fv03_test;hpb=abd31c35793dae7d49fb08bc4313d571e2718806

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 175721d5..527fcf06 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,5 +1,6 @@
 class PanelsController < ApplicationController
-  before_filter :authenticate_user!, :only => [:index, :show, :create, :update, :destroy]
+  layout 'test' if Pettanr::TestLayout
+  before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   private
@@ -13,39 +14,37 @@ class PanelsController < ApplicationController
   # GET /panels
   # GET /panels.json
   def index
-    @panels = Panel.find(:all, :include => [:comic, :author], :order => 'updated_at', :limit => 20)
+    @page = Panel.page params[:page]
+    @page_size = Panel.page_size params[:page_size]
+    @panels = Panel.list({}, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @panels.to_json(
-        :include => [:comic, :author]
-      ) }
+      format.json { render json: @panels.to_json(Panel.list_json_opt) }
     end
   end
 
   # GET /panels/1
   # GET /panels/1.json
   def show
-    @panel = Panel.find(params[:id], include: [:comic, :panel_pictures => :resource_picture, :balloons => :speaches])# only: [:width, :height])
+    @panel = Panel.show(params[:id], @author)
 
     respond_to do |format|
       format.html # show.html.erb
-       format.json {
-        render :json => @panel.to_json(include: {
-          :comic => {}, :panel_pictures => {:include => :image}, :fukidashis => {:include => :serifus}
-        })
-      }
+      format.json { render json: @panel.to_json(Panel.show_json_include_opt) }
       format.jsonp {
-        render :json => "callback(" + @panel.to_json(include: {
-          :comic => {}, :panel_pictures => {:include => :image}, :fukidashis => {:include => :serifus}
-        }) + ");"
+        render :json => "callback(" + @panel.to_json(Panel.show_json_include_opt) + ");"
       }
-#      format.json { render :json => @frame.to_json(include: {
-#        :comic => {:only => :title}, :panel_pictures => {:include => {:image => {:only => [:width]}},:only => [:width, :height, :z, :image_id]}
-#      }, only: [:border]) }
     end
   end
 
+  def count
+    @panel = {:count => Panel.visible_count}
+    respond_to do |format|
+      format.json { render json: @panel.to_json }
+    end
+  end
+  
   def list
     @panels = Panel.all :order => 'updated_at'
 
@@ -63,22 +62,43 @@ class PanelsController < ApplicationController
     end
   end
 
+  def new
+    @panel = Panel.new
+    @panel.supply_default @author
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.js
+      format.json { render json: @panel }
+    end
+  end
+
+  def edit
+    @panel = Panel.show(params[:id], @author)
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
   # POST /panels
   # POST /panels.json
   def create
-    @panel = Panel.new(params[:panel])
+    if params[:json]
+      jsn = JSON.parse(params[:json])
+    end
+    @prm = params[:panel] || jsn
+    @panel = Panel.new(@prm)
     treat_param @panel
-    @comic = Comic.find @panel.comic_id
+#    @comic = Comic.find @panel.comic_id
 
     respond_to do |format|
-      Panel.transaction do
-        if @panel.vdt_save
-          format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
-          format.json { render json: @panel, status: :created, location: @panel }
-        else
-          format.html { render action: "new" }
-          format.json { render json: @panel.errors, status: :unprocessable_entity }
-        end
+      if @panel.store
+        format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
+        format.json { render json: @panel, status: :created, location: @panel }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @panel.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -88,12 +108,17 @@ class PanelsController < ApplicationController
   def update
     @panel = Panel.find(params[:id])
     if @panel.own? @author
+      if params[:json]
+        jsn = JSON.parse(params[:json])
+      end
+      @prm = params[:panel] || jsn
       respond_to do |format|
         Panel.transaction do
           if params[:panel][:t] and params[:panel][:t].to_i != @panel.t
             @panel.move_to params[:panel][:t].to_i
           end
-          if @panel.update_attributes(params[:panel])
+          @panel.attributes = @prm
+          if @panel.store
             format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
             format.json { head :ok }
           else