t#29400:itr3?

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

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index edd47d0..baf9300 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,8 +2,9 @@ class HomeController < ApplicationController
   layout 'test' if Pettanr::TestLayout
   before_filter :authenticate_user!, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, :step2, :save_step2, :step3, :save_step3, 
-    :comic, :picture
+    :comic, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color
   ]
+  before_filter :authenticate_artist, :only => [:picture]
   
   def index
   end
@@ -68,31 +69,79 @@ class HomeController < ApplicationController
   end
   
   def comic
-    @comics = Comic.find(:all, 
-      :include => :author, :conditions => ['author_id = ?', @author.id], 
-      :order => 'updated_at desc', :limit => 20
-    )
+    @page = Author.page params[:page]
+    @page_size = Author.comic_page_size params[:page_size]
+    @comics = Comic.mylist(@author, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @comics }
+      format.json { render json: @comics.to_json(Comic.list_json_opt) }
+    end
+  end
+  
+  def panel
+    @page = Author.page params[:page]
+    @page_size = Author.panel_page_size params[:page_size]
+    @panels = Panel.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @panels.to_json(Panel.list_json_opt) }
     end
   end
   
   def picture
-    if @author.artist?
-      @original_pictures = OriginalPicture.find(:all, 
-        :include => [:artist, :license, :resource_picture], :conditions => ['artist_id = ?', @author.artist.id], 
-        :order => 'updated_at', :limit => 20
-      )
+    @page = OriginalPicture.page params[:page]
+    @page_size = OriginalPicture.page_size params[:page_size]
+    @original_pictures = OriginalPicture.mylist(@artist.id, @page, @page_size)
 
-      respond_to do |format|
-        format.html # index.html.erb
-        format.json { render :json => @original_pictures.to_json(
-          :include => [:resource_picture, :artist, :license]
-        ) }
-      end
-    else
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @original_pictures.to_json(OriginalPicture.list_json_opt) }
+    end
+  end
+  
+  def panel_picture
+    @page = Author.page params[:page]
+    @page_size = Author.panel_picture_page_size params[:page_size]
+    @panel_pictures = PanelPicture.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @panel_pictures.to_json(PanelPicture.list_json_opt) }
+    end
+  end
+  
+  def panel_color
+    @page = Author.page params[:page]
+    @page_size = Author.panel_page_size params[:page_size]
+    @panel_colors = PanelColor.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @panel_colors.to_json(PanelColor.list_json_opt) }
+    end
+  end
+  
+  def ground_picture
+    @page = Author.page params[:page]
+    @page_size = Author.panel_page_size params[:page_size]
+    @ground_pictures = GroundPicture.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
+    end
+  end
+  
+  def ground_color
+    @page = Author.page params[:page]
+    @page_size = Author.panel_page_size params[:page_size]
+    @ground_colors = GroundColor.mylist(@author, @page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @ground_colors.to_json(GroundColor.list_json_opt) }
     end
   end