fix: fetch fail

[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 5d300d0..66fa870 100644 (file)
--- a/app/controllers/sheet_panels_controller.rb
+++ b/app/controllers/sheet_panels_controller.rb
@@ -1,17 +1,13 @@
 class SheetPanelsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :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
+    before_action :authenticate_reader, :only => [
+      :index, :show, :by_sheet, :by_panel, :by_author
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
-  end
-
-  def self.model
-    SheetPanel
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
@@ -19,11 +15,15 @@ class SheetPanelsController < ApplicationController
   end
   
   def by_sheet
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_panel
-    filer_list
+    filer_list param: params[:id]
+  end
+  
+  def by_author
+    filer_list param: params[:id]
   end
   
   def show
@@ -34,89 +34,12 @@ class SheetPanelsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_panel
-    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
-  end
-
-  def create
-    @sheet_panel = SheetPanel.new 
-    @sheet_panel.supply_default
-    @sheet_panel.attributes = params[:sheet_panel]
-    @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 @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(@operators.author) }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => SheetPanel.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
+    form_edit
   end
   
-  def update
-    @sheet_panel = SheetPanel.edit(params[:id], @operators)
-    ot = @sheet_panel.t
-    @sheet_panel.attributes = params[:sheet_panel]
-    @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 @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 }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => SheetPanel.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    @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)
-        format.html { redirect_to play_sheet_path(@sheet) }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => SheetPanel.model_name.human)
-        format.html { redirect_to sheet_panel_path(@sheet_panel) }
-        format.json { render json: @sheet_panel.errors, status: :unprocessable_entity }
-      end
-    end
-  end
 end