fix filer

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

diff --git a/app/controllers/story_sheets_controller.rb b/app/controllers/story_sheets_controller.rb
index 020fee1..e4edfac 100644 (file)
--- a/app/controllers/story_sheets_controller.rb
+++ b/app/controllers/story_sheets_controller.rb
@@ -1,61 +1,57 @@
 class StorySheetsController < 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 => [:index, :show]
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :by_story, :by_sheet, :count, :count_by_story, :count_by_sheet
+    ]
     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
+    StorySheet
+  end
+  
   def index
-    @page = StorySheet.page params[:page]
-    @page_size = StorySheet.page_size params[:page_size]
-    @story_sheets = StorySheet.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html {
-        @paginate = StorySheet.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @story_sheets.to_json(StorySheet.list_json_opt) }
-    end
+    filer_list
   end
-
+  
+  def by_story
+    filer_list
+  end
+  
+  def by_sheet
+    filer_list
+  end
+  
   def show
-    @story_sheet = StorySheet.show(params[:id], [@user, @admin])
+    @item = StorySheet.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html # show.html.erb
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @story_sheet.to_json(StorySheet.show_json_opt) }
+      format_prof format
+      format.json { render json: @item.to_json(StorySheet.show_json_opt) }
     end
   end
   
-  def list
-    @story_sheets = StorySheet.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }# index.html.erb
-      format.json { render json: @story_sheets }
-    end
+  def count
+    list_count
   end
-
-  def browse
-    @story_sheet = StorySheet.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @story_sheet }
-    end
+  
+  def count_by_story
+    list_count
+  end
+  
+  def count_by_sheet
+    list_count
   end
   
   def new
     @story_sheet = StorySheet.new 
     @story_sheet.supply_default
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
       format.json { render json: @story_sheet.to_json(StorySheet.show_json_opt) }
     end
@@ -73,12 +69,12 @@ class StorySheetsController < ApplicationController
     @story_sheet = StorySheet.new 
     @story_sheet.supply_default
     @story_sheet.attributes = params[:story_sheet]
-    @story_sheet.overwrite @author
-    @story = Story.edit(@story_sheet.story_id, @author) if @story_sheet.story_id
-    @sheet = Sheet.show(@story_sheet.sheet_id, @author) if @story_sheet.sheet_id
+    @story_sheet.overwrite @operators
+    @story = Story.edit(@story_sheet.story_id, @operators) if @story_sheet.story_id
+    @sheet = Sheet.show(@story_sheet.sheet_id, @operators) if @story_sheet.sheet_id
     
     respond_to do |format|
-      if @story_sheet.store
+      if @story_sheet.store @operators
         flash[:notice] = I18n.t('flash.notice.created', :model => StorySheet.model_name.human)
         format.html { redirect_to play_story_path(@story) }
         format.json { render json: @story_sheet.to_json(StorySheet.show_json_opt) }
@@ -91,13 +87,13 @@ class StorySheetsController < ApplicationController
   end
   
   def update
-    @story_sheet = StorySheet.edit(params[:id], @author)
+    @story_sheet = StorySheet.edit(params[:id], @operators)
     ot = @story_sheet.t
     @story_sheet.attributes = params[:story_sheet]
-    @story_sheet.overwrite @author
-    @story = Story.edit(@story_sheet.story_id, @author) if @story_sheet.story_id
+    @story_sheet.overwrite @operators
+    @story = Story.edit(@story_sheet.story_id, @operators) if @story_sheet.story_id
     respond_to do |format|
-      if @story_sheet.store ot
+      if @story_sheet.store @operators, ot
         flash[:notice] = I18n.t('flash.notice.updated', :model => StorySheet.model_name.human)
         format.html { redirect_to play_story_path(@story) }
         format.json { head :ok }
@@ -110,8 +106,8 @@ class StorySheetsController < ApplicationController
   end
 
   def destroy
-    @story_sheet = StorySheet.edit(params[:id], @author)
-    @story = Story.edit(@story_sheet.story_id, @author) if @story_sheet.story_id
+    @story_sheet = StorySheet.edit(params[:id], @operators)
+    @story = Story.edit(@story_sheet.story_id, @operators) if @story_sheet.story_id
     respond_to do |format|
       if @story_sheet.destroy_and_shorten
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => StorySheet.model_name.human)