X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fstory_sheets_controller.rb;h=ffabccaa37eb5004526699d32069a0a683c74c4a;hb=62c02bb06a5d343682992461a43df9188f9a7a2f;hp=7444c0b882071ffb100836adacd2d260202f2953;hpb=eb5aee94f87dd1a2c7ee7a5a6a0e88ae3e235166;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/story_sheets_controller.rb b/app/controllers/story_sheets_controller.rb
index 7444c0b8..ffabccaa 100644
--- a/app/controllers/story_sheets_controller.rb
+++ b/app/controllers/story_sheets_controller.rb
@@ -1,57 +1,35 @@
 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]
     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)
-        render :template => 'system/filer', :locals => {
-          :items => @story_sheets, :model => StorySheet, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render :json => @story_sheets.to_json(StorySheet.list_json_opt) }
-    end
+    public_list
   end
-
-  def show
-    @item = StorySheet.show(params[:id], [@user, @admin])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format_prof format
-      format.json { render json: @item.to_json(StorySheet.show_json_opt) }
-    end
+  
+  def by_story
+    filter_list
   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 by_sheet
+    filter_list
   end
-
-  def browse
-    @story_sheet = StorySheet.find(params[:id])
+  
+  def show
+    @item = StorySheet.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @story_sheet }
+      format_prof format
+      format.json { render json: @item.to_json(StorySheet.show_json_opt) }
     end
   end
   
@@ -59,7 +37,7 @@ class StorySheetsController < ApplicationController
     @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
@@ -77,12 +55,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) }
@@ -95,13 +73,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 }
@@ -114,8 +92,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)