fix:server

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 5a05a8f..0132a9d 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -54,13 +54,14 @@ class SheetsController < ApplicationController
     respond_to do |format|
       format.html {
         if @operators.author
-          @new_panel_items = assist_items('panel', 'private')
+          @new_panel_items = assist_items('home', 'panels')
         end
       }
       list_json_format @list, format
     end
   end
   
+=begin
   def new
     set_new
     respond_to do |format|
@@ -87,9 +88,20 @@ class SheetsController < ApplicationController
     end
   end
   
+=end
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
   def create
-    @sheet = Sheet.new
-    @sheet.supply_default 
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
     jsn = nil
     if params[:json]
       jsn = JSON.parse_no_except(params[:json])
@@ -97,41 +109,29 @@ class SheetsController < ApplicationController
     @prm = params[:sheet] || jsn
     
     respond_to do |format|
-      if @sheet.store @prm, @operators
+      if @item.store @prm, @operators
         created_html_format format
         created_json_format format
       else
-        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_html_format format
         not_created_json_format format
       end
     end
   end
   
   def update
-    @sheet = Sheet.edit(params[:id], @operators)
+    set_edit
     jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:sheet] || jsn
     respond_to do |format|
-      if @sheet.store @prm, @operators
+      if @item.store @prm, @operators
         updated_html_format format
         updated_json_format format
       else
-        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_html_format format
         not_updated_json_format format
       end
     end