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

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

diff --git a/app/controllers/sheet_panels_controller.rb b/app/controllers/sheet_panels_controller.rb
index b3296ee..c2f1c78 100644 (file)
--- a/app/controllers/sheet_panels_controller.rb
+++ b/app/controllers/sheet_panels_controller.rb
@@ -4,7 +4,7 @@ class SheetPanelsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_sheet, :by_panel, :count, :count_by_sheet, :count_by_panel
+      :index, :show, :by_sheet, :by_panel, :by_author, :count, :count_by_sheet, :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]
@@ -26,11 +26,14 @@ class SheetPanelsController < ApplicationController
     filer_list
   end
   
+  def by_author
+    filer_list
+  end
+  
   def show
-    @item = SheetPanel.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format_prof format
+      show_prof_format format
       format.json { render json: @item.sheet_panel_as_json(@operators.author) }
     end
   end
@@ -47,24 +50,18 @@ class SheetPanelsController < ApplicationController
     list_count
   end
   
+  def count_by_author
+    list_count
+  end
+  
   def new
-    @sheet_panel = SheetPanel.new 
-    @sheet_panel.supply_default
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @sheet_panel.sheet_panel_as_json(@operators.author) }
-    end
+    form_new
   end
-
+  
   def edit
-    @sheet_panel = SheetPanel.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
     @sheet_panel = SheetPanel.new 
     @sheet_panel.supply_default