X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fcomics_controller.rb;h=3ef277ef020b800c651cb4c5e67ae49642d18dad;hb=69b61b39006c1951fc8c08746e884e63e50233b3;hp=e8aee01a8fe6a3f9ce54f0604bee2aee2837abfd;hpb=d11232cf3353a67172657b902fd535214f8fa899;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index e8aee01a..3ef277ef 100644
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,10 +1,11 @@
 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 => [
+      :index, :show, :play, :by_story, :by_author, :count, :count_by_story, :count_by_author
+    ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
@@ -14,93 +15,105 @@ class ComicsController < ApplicationController
   end
   
   def index
-    public_list
+    filer_list
   end
-
+  
+  def by_story
+    filer_list
+  end
+  
+  def by_author
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      play_list = Locmare::ListGroup.list 'comic_story', 'play'
+      @play_count = play_list.count(@operators, 
+        {:id => @item.id, :my_play => @item.own?(@operators)}
+      )
+    }
+  end
+  
   def show
-    @item = Comic.show(params[:id], @operators)
+    set_show
     respond_to do |format|
-      format.html {
-      }
-      format_prof format
-      format.json { render json: @item.to_json(Comic.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
       format.atom 
       format.rss 
     end
   end
-
-  def count
-    @comic = {:count => Comic.visible_count}
+  
+  def play
+    @item = self.class.model.show(params[:id], @operators)
+    set_play
+    @items = @list.items(@operators, 
+      {:id => params[:id], :my_play => @item.own?(@operators)},
+      0, -1 # no limit
+    )
+    @count = @items.count
+    # no pager
     respond_to do |format|
-      format.json { render json: @comic.to_json }
+      format.html {
+        if @item.own? @operators
+          @new_story_items = assist_items('story', 'private')
+        end
+      }
+      format.json { render json: @items.to_json }
     end
   end
   
+  def count
+    list_count
+  end
+  
+  def count_by_story
+    list_count
+  end
+  
+  def count_by_author
+    list_count
+  end
+  
   def new
-    @comic = Comic.new
-    @comic.supply_default
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @comic.to_json(Comic.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @comic = Comic.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
-    @comic = Comic.new
-    @comic.supply_default 
-    @comic.attributes = params[:comic]
-    @comic.overwrite @operators
-
-    respond_to do |format|
-      if @comic.save
-        flash[:notice] = I18n.t('flash.notice.created', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Comic.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_create
   end
-
+  
   def update
-    @comic = Comic.edit(params[:id], @operators)
-    @comic.attributes = params[:comic]
-    @comic.overwrite @operators
-    respond_to do |format|
-      if @comic.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Comic.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_update
   end
-
+  
   def destroy
-    @comic = Comic.edit(params[:id], @operators)
+    @item = Comic.edit(params[:id], @operators)
     respond_to do |format|
-      if @comic.destroy_with_story
+      if @item.destroy_with_leafs
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => Comic.model_name.human)
         format.html { redirect_to '/home/comics' }
         format.json { head :ok }
       else
         flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
+        format.html { redirect_to @item }
+        format.json { render json: @item.errors, status: :unprocessable_entity }
       end
     end
   end