fix

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 85c47d6..37832c2 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -4,11 +4,10 @@ class StoriesController < ApplicationController
     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 => [:index, :show, :play]
+    before_filter :authenticate_reader, :only => [:index, :show, :play, :story_sheets, :sheets, :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
-  before_filter :authenticate_admin!, :only => [:list, :browse]
 
   def self.model
     Story
@@ -17,15 +16,35 @@ class StoriesController < ApplicationController
   def index
     public_list
   end
-
+  
+  def story_sheets
+    has_many_list
+  end
+  
+  def sheets
+    has_many_list
+  end
+  
+  def by_comic
+    filter_list
+  end
+  
+  def by_sheet
+    filter_list
+  end
+  
+  def by_author
+    filter_list
+  end
+  
   def show
     @item = Story.show(params[:id], @operators)
 
     respond_to do |format|
       format.html { 
-        @story = @item
         if @operators.author
-          @new_sheets = Sheet.mylist(@operators.author, 1, 5)
+          @new_sheet_items = assist_items('sheet', 'private_list')
+          @new_sheet_filer = assist_filer 'sheet', @new_sheet_items
         end
       }
       format_prof format
@@ -34,14 +53,15 @@ class StoriesController < ApplicationController
   end
   
   def play
-    @story = Story.show(params[:id], [@user, @admin])
+    @item = Story.show(params[:id], @operators)
     @page = StorySheet.page params[:page]
-    @sheet = StorySheet.play_sheet(@story, @author, @page)
+    @sheet = StorySheet.play_sheet(@item, @operators, @page)
     respond_to do |format|
       format.html {
-        @paginate = StorySheet.play_paginate(@story, @page)
-        if @author
-          @new_sheets = Sheet.mylist(@author, 1, 5)
+        @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 {
@@ -58,36 +78,18 @@ class StoriesController < ApplicationController
     end
   end
   
-  def list
-    @stories = Story.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }# index.html.erb
-      format.json { render json: @stories }
-    end
-  end
-
-  def browse
-    @story = Story.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @story }
-    end
-  end
-  
   def new
     @story = Story.new 
     @story.supply_default
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
       format.json { render json: @story.to_json(Story.show_json_opt) }
     end
   end
 
   def edit
-    @story = Story.edit(params[:id], @author)
+    @story = Story.edit(params[:id], @operators)
     respond_to do |format|
       format.html 
       format.js
@@ -99,10 +101,10 @@ class StoriesController < ApplicationController
     @story.supply_default
     @story.attributes = params[:story]
     @story.overwrite
-    @comic = Comic.edit(@story.comic_id, @author) if @story.comic_id
+    @comic = Comic.edit(@story.comic_id, @operators) if @story.comic_id
     
     respond_to do |format|
-      if @story.store @author
+      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) }
@@ -115,12 +117,12 @@ class StoriesController < ApplicationController
   end
   
   def update
-    @story = Story.edit(params[:id], @author)
+    @story = Story.edit(params[:id], @operators)
     ot = @story.t
     @story.attributes = params[:story]
     @story.overwrite
     respond_to do |format|
-      if @story.store  @author, ot
+      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 }
@@ -133,7 +135,7 @@ class StoriesController < ApplicationController
   end
 
   def destroy
-    @story = Story.edit(params[:id], @author)
+    @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)