X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fpanel_pictures_controller.rb;h=d2f310b6fa179bdb9198cec6473a7b8009545580;hp=6af49e44f327186f8f90b5f02e2068583e397c87;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=62c02bb06a5d343682992461a43df9188f9a7a2f

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 6af49e44..d2f310b6 100644
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -1,138 +1,39 @@
 class PanelPicturesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :by_panel, :by_author]
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
-  end
-
-  def self.model
-    PanelPicture
+    before_action :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author
+    ]
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   end
   
   def index
-    public_list
+    filer_list
   end
   
   def by_panel
-    filter_list
+    filer_list param: params[:id]
   end
   
   def by_author
-    filter_list
+    filer_list param: params[:id]
   end
   
-  def show
-    @item = PanelPicture.show(params[:id], @operators)
-
-    respond_to do |format|
-      format.html {
-        @panel_picture = @item
-      }
-      format_prof format
-      format.json { render :json => @item.to_json(PanelPicture.show_json_opt) }
-    end
-  end
-
-  def new
-    raise Pettanr::NotWork unless @operators.author.working_panel
-    @picture = Picture.show params[:picture_id], @operators
-    raise ActiveRecord::Forbidden unless @picture.enable?
-    @panel = Panel.edit(@operators.author.working_panel, @operators)
-    
-    @item = PanelPicture.new :panel_id => @panel.id, :picture_id => @picture.id
-    @item.supply_default
-    respond_to do |format|
-      format.html {
-        mounted = 1
-        form_manager = Pettanr::Application::manifest.form_managers[@item.form_name]
-        @form = form_manager.open @item, @operators, mounted
-      }
-      format.json { render :json => @panel_picture.to_json(PanelPicture.show_json_opt) }
-    end
-  end
-
-  def edit
-    @item = PanelPicture.show(params[:id], @operators)
-    @panel = Panel.edit(@item.panel.id, @operators)
-    
-    respond_to do |format|
-      format.html {
-        mounted = 1
-        form_manager = Pettanr::Application::manifest.form_managers[@item.form_name]
-        @form = form_manager.open @item, @operators, mounted
-      }
-    end
+  def show_html_format format
+    format.html {
+      @panel_picture = @item
+    }
   end
-
-  def create
-    raise Pettanr::NotWork unless @operators.author.working_panel
-    @panel = Panel.edit(@operators.author.working_panel, @operators)
-    
-    @panel_picture = PanelPicture.new 
-    @panel_picture.attributes = params[:panel_picture]
-    @panel_picture.overwrite @panel.id
-    
-    @picture = Picture.show @panel_picture.picture_id, @operators
-    raise ActiveRecord::Forbidden unless @picture.enable?
-    
-    respond_to do |format|
-      if @panel_picture.valid?
-        if @panel_picture.store @operators
-          flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
-          format.html { redirect_to @panel }
-          format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
-        else
-          flash[:notice] = I18n.t('flash.notice.not_created', :model => PanelPicture.model_name.human)
-          format.html { render action: "new" }
-          format.json { render json: @panel.errors, status: :unprocessable_entity }
-        end
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => PanelPicture.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @panel_picture.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def update
-    @panel_picture = PanelPicture.show(params[:id], @operators)
-    @panel_picture.attributes = params[:panel_picture]
-    @panel = Panel.edit(@panel_picture.panel.id, @operators)
-    @panel_picture.overwrite @panel.id
-    
-    @picture = Picture.show @panel_picture.picture_id, @operators
-    raise ActiveRecord::Forbidden unless @picture.enable?
-    
-    respond_to do |format|
-      if @panel_picture.store @operators
-        flash[:notice] = I18n.t('flash.notice.updated', :model => PanelPicture.model_name.human)
-        format.html { redirect_to @panel_picture }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => PanelPicture.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @panel_picture.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    @panel_picture = PanelPicture.show(params[:id], @operators)
-    @panel = Panel.edit(@panel_picture.panel.id, @operators)
-    
+  
+  def show
+    set_show
     respond_to do |format|
-      if @panel_picture.remove @operators
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => PanelPicture.model_name.human)
-        format.html { redirect_to @panel }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => PanelPicture.model_name.human)
-        format.html { redirect_to @panel_picture }
-        format.json { render json: @panel_picture.errors, status: :unprocessable_entity }
-      end
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end