fix play

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index ab093eb..2f24813 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -1,104 +1,100 @@
 class SheetsController < 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, :play]
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :play, :by_story, :by_panel, :by_author, :count, :count_by_story, :count_by_panel, :count_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]
 
-  @@model = Sheet
+  def self.model
+    Sheet
+  end
+  
   def index
-    set_filer
-
-    respond_to do |format|
-      format_filer format
-      format.json { render json: @items.to_json(@@model.list_json_opt) }
-      format.atom 
-      format.rss
-    end
+    filer_list
   end
-
+  
+  def by_story
+    filer_list
+  end
+  
+  def by_panel
+    filer_list
+  end
+  
+  def by_author
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      if @operators.author
+        @new_panel_items = assist_items('panel', 'private')
+        #new_panel_filer = assist_filer 'panel', @new_panel_items
+        
+        @new_story_items = assist_items('story', 'private')
+        #new_story_filer = assist_filer 'story', @new_story_items
+        @fresh_story_items = assist_items('story_sheet', 'private').map {|ss| ss.story}
+        #@fresh_story_filer = assist_filer 'story', @fresh_story_items
+      end
+    }
+  end
+  
   def show
-    @item = Sheet.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html {
-        @sheet = @item
-        if @operators.author
-          @new_panels = Panel.mylist(@operators.author, 1, 5)
-          @new_stories = Story.mylist(@operators.author, 1, 5)
-          @fresh_stories = StorySheet.mylist(@operators.author, 1, 5).map {|ss| ss.story}
-        end
-      }
-      format_prof format
-      format.json { render json: @item.to_json(Sheet.show_json_opt) }
-      format.atom 
-      format.rss 
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
 
   def play
-    @sheet = Sheet.show(params[:id], [@user, @admin])
+    @item = self.class.model.show(params[:id], @operators)
+    set_play
+    list_result = @list.open(@operators, 
+      {:id => params[:id]}
+    )
+    @items = list_result.items 
     respond_to do |format|
       format.html {
-        if @author
-          @new_panels = Panel.mylist(@author, 1, 5)
+        if @operators.author
+          @new_panel_items = assist_items('panel', 'private')
+          # @new_panel_filer = assist_filer 'panel', @new_panel_items
         end
       }
-      format.json {render json: @sheet.to_json(Sheet.show_json_opt)}
-      format.jsonp {
-        render :json => "callback(" + @sheet_panels.to_json_list + ");"
-      }
+      format.json { render json: @items.to_json(self.class.model.list_json_opt) }
     end
   end
   
   def count
-    @sheet = {:count => Sheet.visible_count}
-    respond_to do |format|
-      format.json { render json: @sheet.to_json }
-    end
+    list_count
   end
   
-  def list
-    @sheets = Sheet.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }# index.html.erb
-      format.json { render json: @sheets }
-    end
+  def count_by_story
+    list_count
   end
-
-  def browse
-    @sheet = Sheet.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @sheet }
-    end
+  
+  def count_by_panel
+    list_count
+  end
+  
+  def count_by_author
+    list_count
   end
   
   def new
-    @sheet = Sheet.new
-    @sheet.supply_default
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-      format.json { render json: @sheet.to_json(Sheet.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @sheet = Sheet.edit(params[:id], @author)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
     @sheet = Sheet.new
     @sheet.supply_default 
@@ -109,7 +105,7 @@ class SheetsController < ApplicationController
     @prm = params[:sheet] || jsn
 
     respond_to do |format|
-      if @sheet.store @prm, @author
+      if @sheet.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.created', :model => Sheet.model_name.human)
         format.html { redirect_to @sheet }
         format.json { render json: @sheet.to_json(Sheet.show_json_opt), status: :created, location: @sheet }
@@ -122,14 +118,14 @@ class SheetsController < ApplicationController
   end
 
   def update
-    @sheet = Sheet.edit(params[:id], @author)
+    @sheet = Sheet.edit(params[:id], @operators)
     jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:sheet] || jsn
     respond_to do |format|
-      if @sheet.store @prm, @author
+      if @sheet.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.updated', :model => Sheet.model_name.human)
         format.html { redirect_to @sheet }
         format.json { head :ok }
@@ -142,7 +138,7 @@ class SheetsController < ApplicationController
   end
 
   def destroy
-    @sheet = Sheet.edit(params[:id], @author)
+    @sheet = Sheet.edit(params[:id], @operators)
     respond_to do |format|
       if @sheet.destroy_with_sheet_panel
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => Sheet.model_name.human)