t#32025:comic rename

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

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index 4773984..75fa2d0 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -4,7 +4,7 @@ class AuthorsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
     before_filter :authenticate_author, :only => [:edit, :update]
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :comics, :stories, :panels, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors]
+    before_filter :authenticate_reader, :only => [:index, :show, :scrolls, :scroll_panels, :panels, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
     before_filter :authenticate_author, :only => [:edit, :update]
   end
@@ -32,33 +32,33 @@ class AuthorsController < ApplicationController
     end
   end
 
-  def comics
+  def scrolls
     @au = Author.show(params[:id], [@user, @admin])
 
     @page = Author.page params[:page]
-    @page_size = Author.comic_page_size params[:page_size]
-    @comics = Comic.himlist(@au, @page, @page_size)
+    @page_size = Author.scroll_page_size params[:page_size]
+    @scrolls = Scroll.himlist(@au, @page, @page_size)
 
     respond_to do |format|
       format.html {
-        @paginate = Comic.himlist_paginate(@au, @page, @page_size)
+        @paginate = Scroll.himlist_paginate(@au, @page, @page_size)
       }
-      format.json { render json: @comics.to_json(Comic.list_json_opt) }
+      format.json { render json: @scrolls.to_json(Scroll.list_json_opt) }
     end
   end
   
-  def stories
+  def scroll_panels
     @au = Author.show(params[:id], [@user, @admin])
 
     @page = Author.page params[:page]
-    @page_size = Author.comic_page_size params[:page_size]
-    @stories = Story.himlist(@au, @page, @page_size)
+    @page_size = Author.scroll_page_size params[:page_size]
+    @scroll_panels = ScrollPanel.himlist(@au, @page, @page_size)
 
     respond_to do |format|
       format.html {
-        @paginate = Story.himlist_paginate(@au, @page, @page_size)
+        @paginate = ScrollPanel.himlist_paginate(@au, @page, @page_size)
       }
-      format.json { render json: @stories.to_json(Story.list_json_opt) }
+      format.json { render json: @scroll_panels.to_json(ScrollPanel.list_json_opt) }
     end
   end