fix mani

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index e459528..0765171 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -30,18 +30,21 @@ class StoriesController < ApplicationController
     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
   
@@ -53,8 +56,8 @@ class StoriesController < ApplicationController
       format.html {
         @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
+          @new_sheet_items = assist_items('sheet', 'private')
+          #@new_sheet_filer = assist_filer 'sheet', @new_sheet_items
         end
       }
       format.json {
@@ -88,23 +91,13 @@ class StoriesController < ApplicationController
   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