Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 2f24813..ec3dfc9 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -34,12 +34,9 @@ class SheetsController < ApplicationController
     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
@@ -49,10 +46,10 @@ class SheetsController < ApplicationController
     respond_to do |format|
       show_html_format format
       show_prof_format format
-      show_json_format format
+      show_json_format_for_root format
     end
   end
-
+  
   def play
     @item = self.class.model.show(params[:id], @operators)
     set_play
@@ -64,7 +61,6 @@ class SheetsController < ApplicationController
       format.html {
         if @operators.author
           @new_panel_items = assist_items('panel', 'private')
-          # @new_panel_filer = assist_filer 'panel', @new_panel_items
         end
       }
       format.json { render json: @items.to_json(self.class.model.list_json_opt) }
@@ -88,11 +84,29 @@ class SheetsController < ApplicationController
   end
   
   def new
-    form_new
+    set_new
+    respond_to do |format|
+      format.html {
+        @editor = Editor::SheetEditor.new @item, @operators
+        render :template => @editor.template_name, :locals => {
+          :editor => @editor
+        }
+      }
+      format.json { render json: @item.to_json }
+    end
   end
   
   def edit
-    form_edit
+    set_edit
+    respond_to do |format|
+      format.html {
+        @editor = Editor::SheetEditor.new @item, @operators
+        render :template => @editor.template_name, :locals => {
+          :editor => @editor
+        }
+      }
+      format.json { render json: @item.to_json }
+    end
   end
   
   def create
@@ -103,20 +117,24 @@ class SheetsController < ApplicationController
       jsn = JSON.parse_no_except(params[:json])
     end
     @prm = params[:sheet] || jsn
-
+    
     respond_to do |format|
       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 }
+        created_html_format format
+        created_json_format format
       else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Sheet.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @sheet.errors, status: :unprocessable_entity }
+        format.html {
+          flash[:notice] = I18n.t('flash.notice.not_created', :model => @my_model_class.model_name.human)
+          @editor = Editor::PanelEditor.new @item, @operators
+          render :template => @editor.template_name, :locals => {
+            :editor => @editor
+          }
+        }
+        not_created_json_format format
       end
     end
   end
-
+  
   def update
     @sheet = Sheet.edit(params[:id], @operators)
     jsn = nil
@@ -126,17 +144,21 @@ class SheetsController < ApplicationController
     @prm = params[:sheet] || jsn
     respond_to do |format|
       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 }
+        updated_html_format format
+        updated_json_format format
       else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Sheet.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @sheet.errors, status: :unprocessable_entity }
+        format.html {
+          flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
+          @editor = Editor::PanelEditor.new @item, @operators
+          render :template => @editor.template_name, :locals => {
+            :editor => @editor
+          }
+        }
+        not_updated_json_format format
       end
     end
   end
-
+  
   def destroy
     @sheet = Sheet.edit(params[:id], @operators)
     respond_to do |format|