t#31470:create pager

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

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index 25c29af..1350c4d 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -16,7 +16,9 @@ class AuthorsController < ApplicationController
     @authors = Author.list(@page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = Author.list_paginate(@page, @page_size)
+      }
       format.json { render :json => @authors.to_json(Author.list_json_opt) }
     end
   end
@@ -38,7 +40,9 @@ class AuthorsController < ApplicationController
     @comics = Comic.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = Comic.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render json: @comics.to_json(Comic.list_json_opt) }
     end
   end
@@ -51,7 +55,9 @@ class AuthorsController < ApplicationController
     @stories = Story.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = Story.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render json: @stories.to_json(Story.list_json_opt) }
     end
   end
@@ -64,7 +70,9 @@ class AuthorsController < ApplicationController
     @panels = Panel.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = Panel.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render text: Panel.list_as_json_text(@panels) }
     end
   end
@@ -77,7 +85,9 @@ class AuthorsController < ApplicationController
     @panel_pictures = PanelPicture.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = PanelPicture.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render json: @panel_pictures.to_json(PanelPicture.list_json_opt) }
     end
   end
@@ -90,7 +100,9 @@ class AuthorsController < ApplicationController
     @ground_pictures = GroundPicture.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = GroundPicture.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
     end
   end
@@ -103,24 +115,13 @@ class AuthorsController < ApplicationController
     @ground_colors = GroundColor.himlist(@au, @page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = GroundColor.himlist_paginate(@au, @page, @page_size)
+      }
       format.json { render json: @ground_colors.to_json(GroundColor.list_json_opt) }
     end
   end
   
-  def panel_colors
-    @au = Author.show(params[:id], [@user, @admin])
-
-    @page = Author.page params[:page]
-    @page_size = Author.panel_color_page_size params[:page_size]
-    @panel_colors = PanelColor.himlist(@au, @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 count
     @au = {:count => Author.visible_count}
     respond_to do |format|