element

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 37832c2..0b8fea2 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -1,10 +1,11 @@
 class StoriesController < 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, :story_sheets, :sheets, :by_comic, :by_sheet, :by_author]
+    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_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
@@ -14,41 +15,36 @@ class StoriesController < ApplicationController
   end
   
   def index
-    public_list
-  end
-  
-  def story_sheets
-    has_many_list
-  end
-  
-  def sheets
-    has_many_list
+    filer_list
   end
   
   def by_comic
-    filter_list
+    filer_list
   end
   
   def by_sheet
-    filter_list
+    filer_list
   end
   
   def by_author
-    filter_list
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      if @operators.author
+        @new_sheet_items = assist_items('sheet', 'private')
+        #@new_sheet_filer = assist_filer 'sheet', @new_sheet_items
+      end
+    }
   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
   
@@ -78,24 +74,30 @@ class StoriesController < ApplicationController
     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
-    @story = Story.new 
-    @story.supply_default
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @story.to_json(Story.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @story = Story.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
     @story = Story.new 
     @story.supply_default