t#31566:add mylist sb

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

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index 531f46d..4773984 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, :panels]
+    before_filter :authenticate_reader, :only => [:index, :show, :comics, :stories, :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
@@ -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
@@ -35,27 +37,106 @@ class AuthorsController < ApplicationController
 
     @page = Author.page params[:page]
     @page_size = Author.comic_page_size params[:page_size]
-    @comics = Comic.mylist(@au, @page, @page_size)
+    @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
   
+  def stories
+    @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)
+
+    respond_to do |format|
+      format.html {
+        @paginate = Story.himlist_paginate(@au, @page, @page_size)
+      }
+      format.json { render json: @stories.to_json(Story.list_json_opt) }
+    end
+  end
+  
   def panels
     @au = Author.show(params[:id], [@user, @admin])
 
     @page = Author.page params[:page]
     @page_size = Author.panel_page_size params[:page_size]
-    @panels = Panel.mylist(@au, @page, @page_size)
+    @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
   
+  def panel_pictures
+    @au = Author.show(params[:id], [@user, @admin])
+
+    @page = Author.page params[:page]
+    @page_size = Author.panel_picture_page_size params[:page_size]
+    @panel_pictures = PanelPicture.himlist(@au, @page, @page_size)
+
+    respond_to do |format|
+      format.html {
+        @paginate = PanelPicture.himlist_paginate(@au, @page, @page_size)
+      }
+      format.json { render json: @panel_pictures.to_json(PanelPicture.list_json_opt) }
+    end
+  end
+  
+  def speech_balloons
+    @au = Author.show(params[:id], [@user, @admin])
+
+    @page = Author.page params[:page]
+    @page_size = Author.panel_picture_page_size params[:page_size]
+    @speech_balloons = SpeechBalloon.himlist(@au, @page, @page_size)
+
+    respond_to do |format|
+      format.html {
+        @paginate = SpeechBalloon.himlist_paginate(@au, @page, @page_size)
+      }
+      format.json { render json: @speech_balloons.to_json(SpeechBalloon.list_json_opt) }
+    end
+  end
+  
+  def ground_pictures
+    @au = Author.show(params[:id], [@user, @admin])
+
+    @page = Author.page params[:page]
+    @page_size = Author.ground_picture_page_size params[:page_size]
+    @ground_pictures = GroundPicture.himlist(@au, @page, @page_size)
+
+    respond_to do |format|
+      format.html {
+        @paginate = GroundPicture.himlist_paginate(@au, @page, @page_size)
+      }
+      format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
+    end
+  end
+  
+  def ground_colors
+    @au = Author.show(params[:id], [@user, @admin])
+
+    @page = Author.page params[:page]
+    @page_size = Author.ground_color_page_size params[:page_size]
+    @ground_colors = GroundColor.himlist(@au, @page, @page_size)
+
+    respond_to do |format|
+      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 count
     @au = {:count => Author.visible_count}
     respond_to do |format|
@@ -105,6 +186,7 @@ class AuthorsController < ApplicationController
         format.html { redirect_to root_path }
         format.json { render json: @au.to_json(Author.show_json_opt), status: :created, location: @artist }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Author.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @au.errors, status: :unprocessable_entity }
       end
@@ -122,6 +204,7 @@ class AuthorsController < ApplicationController
         format.html { redirect_to '/home/configure' }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Author.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @au.errors, status: :unprocessable_entity }
       end