X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fstories_controller.rb;h=0792326543673b55988ab53daec969fefce5c873;hp=89676e1cf3e4a0c947804497431643cbfce0e246;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=c75552d8db3397821ffc4913bc9e465f6141b5c5

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 89676e1c..07923265 100644
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -1,17 +1,13 @@
 class StoriesController < ApplicationController
   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]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [
-      :index, :show, :play, :by_comic, :by_sheet, :by_author, :count, :count_by_comic, :count_by_sheet, :count_by_author
+    before_action :authenticate_reader, :only => [
+      :index, :show, :play, :by_comic, :by_sheet, :by_author
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
-  end
-
-  def self.model
-    Story
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
@@ -19,74 +15,50 @@ class StoriesController < ApplicationController
   end
   
   def by_comic
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_sheet
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_author
-    filer_list
+    filer_list param: params[:id]
+  end
+  
+  def show_html_format format
+    format.html {
+      @play_list = Locmare::ListGroup.list(
+        'story_sheets', 'by_story', @operators, 
+        {:id => @item.id, :page_size => -1}  # set no limit options
+      )
+    }
   end
   
   def show
-    @item = Story.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html { 
-        if @operators.author
-          @new_sheet_items = assist_items('sheet', 'private_list')
-          @new_sheet_filer = assist_filer 'sheet', @new_sheet_items
-        end
-      }
-      format_prof format
-      format.json { render json: @item.to_json(Story.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
   def play
-    @item = Story.show(params[:id], @operators)
-    @page = StorySheet.page params[:page]
-    @sheet = StorySheet.play_sheet(@item, @operators, @page)
+    set_play
+    @finder.per( 1)   # show one sheet
+    play_list
     respond_to do |format|
       format.html {
-        @paginate = StorySheet.play_paginate(@item, @page)
-        if @operators.author
-          @new_sheet_items = assist_items('sheet', 'private_list')
-          @new_sheet_filer = assist_filer 'sheet', @new_sheet_items
-        end
-      }
-      format.json {
-        if @sheet
-          @story_sheets = SheetPanel.play_list @sheet, @author
-          render text: SheetPanel.list_as_json_text(@story_sheets, @author)
-        else
-          render text: ''
+        @pager = @finder
+        if @item.own? @operators
+          @new_sheet_items = assist_items('home', 'sheets', finder: :find_private, param: @operators)
         end
       }
-      format.jsonp {
-        render :json => "callback(" + @story_sheets.to_json_list + ");"
-      }
+      list_json_format @finder, format
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_comic
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     form_new
   end
@@ -96,55 +68,27 @@ class StoriesController < ApplicationController
   end
   
   def create
-    @story = Story.new 
-    @story.supply_default
-    @story.attributes = params[:story]
-    @story.overwrite
-    @comic = Comic.edit(@story.comic_id, @operators) if @story.comic_id
-    
-    respond_to do |format|
-      if @story.store @operators
-        flash[:notice] = I18n.t('flash.notice.created', :model => Story.model_name.human)
-        format.html { redirect_to play_story_path(@story, :page => @story.t.to_i + 1) }
-        format.json { render json: @story.to_json(Story.show_json_opt) }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Story.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @story.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @story = @item
+    @item = @my_model_class.new
+    @item.supply_default 
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_create
   end
   
   def update
-    @story = Story.edit(params[:id], @operators)
-    ot = @story.t
-    @story.attributes = params[:story]
-    @story.overwrite
-    respond_to do |format|
-      if @story.store @operators, ot
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Story.model_name.human)
-        format.html { redirect_to play_story_path(@story, :page => @story.t.to_i + 1) }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Story.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @story.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @story = @item
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_update
   end
-
+  
   def destroy
-    @story = Story.edit(params[:id], @operators)
-    respond_to do |format|
-      if @story.destroy_and_shorten
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => Story.model_name.human)
-        format.html { redirect_to comic_path(@story.comic)}
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Story.model_name.human)
-        format.html { redirect_to story_path(@story) }
-        format.json { render json: @story.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/home/' + @item.path_name
   end
+  
 end