t#:

[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 23320d6..5d51278 100644 (file)
--- a/app/controllers/sheet_panels_controller.rb
+++ b/app/controllers/sheet_panels_controller.rb
@@ -8,45 +8,24 @@ class SheetPanelsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
 
-  def index
-    @page = SheetPanel.page params[:page]
-    @page_size = SheetPanel.page_size params[:page_size]
-    @sheet_panels = SheetPanel.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html {
-        @paginate = SheetPanel.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @sheet_panels.to_json(SheetPanel.list_json_opt) }
-    end
-  end
-
-  def show
-    @sheet_panel = SheetPanel.show(params[:id], [@user, @admin])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @sheet_panel.sheet_panel_as_json(@author) }
-    end
+  def self.model
+    SheetPanel
   end
   
-  def list
-    @sheet_panels = SheetPanel.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }# index.html.erb
-      format.json { render json: @sheet_panels }
-    end
+  def index
+    public_list
   end
 
-  def browse
-    @sheet_panel = SheetPanel.find(params[:id])
+  def show
+    @item = SheetPanel.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html { render layout: 'system' } # show.html.erb
-      format.json { render json: @sheet_panel }
+      format.html {
+        @sheet_panel = @item
+      }
+      format_prof format
+      format.json { render json: @item.sheet_panel_as_json(@operators.author) }
     end
   end
   
@@ -54,14 +33,14 @@ class SheetPanelsController < ApplicationController
     @sheet_panel = SheetPanel.new 
     @sheet_panel.supply_default
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
-      format.json { render json: @sheet_panel.sheet_panel_as_json(@author) }
+      format.json { render json: @sheet_panel.sheet_panel_as_json(@operators.author) }
     end
   end
 
   def edit
-    @sheet_panel = SheetPanel.edit(params[:id], @author)
+    @sheet_panel = SheetPanel.edit(params[:id], @operators)
     respond_to do |format|
       format.html 
       format.js
@@ -72,15 +51,15 @@ class SheetPanelsController < ApplicationController
     @sheet_panel = SheetPanel.new 
     @sheet_panel.supply_default
     @sheet_panel.attributes = params[:sheet_panel]
-    @sheet_panel.overwrite @author
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @author) if @sheet_panel.sheet_id
-    @panel = Panel.show(@sheet_panel.panel_id, @author) if @sheet_panel.panel_id
+    @sheet_panel.overwrite @operators
+    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
+    @panel = Panel.show(@sheet_panel.panel_id, @operators) if @sheet_panel.panel_id
     
     respond_to do |format|
-      if @sheet_panel.store
+      if @sheet_panel.store @operators
         flash[:notice] = I18n.t('flash.notice.created', :model => SheetPanel.model_name.human)
         format.html { redirect_to play_sheet_path(@sheet) }
-        format.json { render json: @sheet_panel.sheet_panel_as_json(@author) }
+        format.json { render json: @sheet_panel.sheet_panel_as_json(@operators.author) }
       else
         flash[:notice] = I18n.t('flash.notice.not_created', :model => SheetPanel.model_name.human)
         format.html { render action: "new" }
@@ -90,13 +69,13 @@ class SheetPanelsController < ApplicationController
   end
   
   def update
-    @sheet_panel = SheetPanel.edit(params[:id], @author)
+    @sheet_panel = SheetPanel.edit(params[:id], @operators)
     ot = @sheet_panel.t
     @sheet_panel.attributes = params[:sheet_panel]
-    @sheet_panel.overwrite @author
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @author) if @sheet_panel.sheet_id
+    @sheet_panel.overwrite @operators
+    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
     respond_to do |format|
-      if @sheet_panel.store ot
+      if @sheet_panel.store @operators, ot
         flash[:notice] = I18n.t('flash.notice.updated', :model => SheetPanel.model_name.human)
         format.html { redirect_to play_sheet_path(@sheet) }
         format.json { head :ok }
@@ -109,8 +88,8 @@ class SheetPanelsController < ApplicationController
   end
 
   def destroy
-    @sheet_panel = SheetPanel.edit(params[:id], @author)
-    @sheet = Sheet.edit(@sheet_panel.sheet_id, @author) if @sheet_panel.sheet_id
+    @sheet_panel = SheetPanel.edit(params[:id], @operators)
+    @sheet = Sheet.edit(@sheet_panel.sheet_id, @operators) if @sheet_panel.sheet_id
     respond_to do |format|
       if @sheet_panel.destroy_and_shorten
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => SheetPanel.model_name.human)