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 45644bb..baf9300 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,7 +2,7 @@ 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, :panel, :picture, :panel_picture
+    :comic, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color
   ]
   before_filter :authenticate_artist, :only => [:picture]
   
@@ -71,29 +71,29 @@ class HomeController < ApplicationController
   def comic
     @page = Author.page params[:page]
     @page_size = Author.comic_page_size params[:page_size]
-    @comics = Comic.mylist(@author, {}, @page, @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)
+    @panels = Panel.mylist(@author, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panels }
+      format.json { render json: @panels.to_json(Panel.list_json_opt) }
     end
   end
   
   def picture
     @page = OriginalPicture.page params[:page]
     @page_size = OriginalPicture.page_size params[:page_size]
-    @original_pictures = OriginalPicture.list(@artist.id, {}, @page, @page_size)
+    @original_pictures = OriginalPicture.mylist(@artist.id, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -104,11 +104,44 @@ class HomeController < ApplicationController
   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)
+    @panel_pictures = PanelPicture.mylist(@author, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panel_pictures }
+      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