X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fcomics_controller.rb;h=1c4ed68b5adc515078b9a2098b11b49f805f1403;hb=62c02bb06a5d343682992461a43df9188f9a7a2f;hp=d8729a373d96430fc95c010cda192d62ea1cf6c7;hpb=6f2a183413df55de274cf896a0b54fceb6be00bf;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index d8729a37..1c4ed68b 100644
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,35 +1,38 @@
 class ComicsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:top, :index, :show]
+    before_filter :authenticate_reader, :only => [:top, :index, :show, :stories, :by_author]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  def self.model
+    Comic
+  end
+  
   def index
-    @page = Comic.page params[:page]
-    @page_size = Comic.page_size params[:page_size]
-    @comics = Comic.list(@page, @page_size)
-    respond_to do |format|
-      format.html {
-        @paginate = Comic.list_paginate(@page, @page_size)
-      }
-      format.json { render json: @comics.to_json(Comic.list_json_opt) }
-      format.atom 
-      format.rss
-    end
+    @action = self.class.controller.open(action_name, params, @operators)
+    @action.cook params, operators
+    public_list
   end
 
-  def show
-    @comic = Comic.show(params[:id], [@user, @admin])
+  def stories
+    has_many_list
+  end
+
+  def by_author
+    filter_list
+  end
 
+  def show
+    @item = Comic.show(params[:id], @operators)
     respond_to do |format|
-      format.html 
-      format.json { render json: @comic.to_json(Comic.show_json_opt) }
+      format.html {
+      }
+      format_prof format
+      format.json { render json: @item.to_json(Comic.show_json_opt) }
       format.atom 
       format.rss 
     end
@@ -42,36 +45,18 @@ class ComicsController < ApplicationController
     end
   end
   
-  def list
-    @comics = Comic.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }# index.html.erb
-      format.json { render json: @comics }
-    end
-  end
-
-  def browse
-    @comic = Comic.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @comic }
-    end
-  end
-  
   def new
     @comic = Comic.new
     @comic.supply_default
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
       format.json { render json: @comic.to_json(Comic.show_json_opt) }
     end
   end
 
   def edit
-    @comic = Comic.edit(params[:id], @author)
+    @comic = Comic.edit(params[:id], @operators)
     respond_to do |format|
       format.html 
       format.js
@@ -82,7 +67,7 @@ class ComicsController < ApplicationController
     @comic = Comic.new
     @comic.supply_default 
     @comic.attributes = params[:comic]
-    @comic.overwrite @author
+    @comic.overwrite @operators
 
     respond_to do |format|
       if @comic.save
@@ -98,9 +83,9 @@ class ComicsController < ApplicationController
   end
 
   def update
-    @comic = Comic.edit(params[:id], @author)
+    @comic = Comic.edit(params[:id], @operators)
     @comic.attributes = params[:comic]
-    @comic.overwrite @author
+    @comic.overwrite @operators
     respond_to do |format|
       if @comic.save
         flash[:notice] = I18n.t('flash.notice.updated', :model => Comic.model_name.human)
@@ -115,7 +100,7 @@ class ComicsController < ApplicationController
   end
 
   def destroy
-    @comic = Comic.edit(params[:id], @author)
+    @comic = Comic.edit(params[:id], @operators)
     respond_to do |format|
       if @comic.destroy_with_story
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => Comic.model_name.human)