X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fpanel_pictures_controller.rb;h=3ae4dac9c218eb26b4f58116b1a71c659d89f00e;hb=d6d237012089604cdbc61943856d42c0a0472dc7;hp=36798942aa74046a581bf19fbada532b08176409;hpb=3aabbdd8720ec40eae15a1e10b5bbdbec5a4bc0a;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 36798942..3ae4dac9 100644
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -1,47 +1,40 @@
 class PanelPicturesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_user!, :only => [:index, :show]
-  before_filter :authenticate_author, :only => [:index, :show]
-  before_filter :authenticate_admin!, :only => [:list, :browse]
-
-  # GET /panel_pictures
-  # GET /panel_pictures.json
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
+    before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
+  else
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author
+    ]
+    before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
+  end
+  
   def index
-    @page = PanelPicture.page params[:page]
-    @page_size = PanelPicture.page_size params[:page_size]
-    @panel_pictures = PanelPicture.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @panel_pictures.to_json(PanelPicture.list_json_opt) }
-    end
+    filer_list
   end
-
-  def show
-    @panel_picture = PanelPicture.show(params[:id], @author)
-
-    respond_to do |format|
-      format.html
-      format.json { render :json => @panel_picture.to_json(PanelPicture.show_json_opt) }
-    end
+  
+  def by_panel
+    filer_list
   end
-
-  def list
-    @panel_pictures = PanelPicture.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @panel_pictures }
-    end
+  
+  def by_author
+    filer_list
   end
-
-  def browse
-    @panel_picture = PanelPicture.find(params[:id])
-
+  
+  def show_html_format format
+    format.html {
+      @panel_picture = @item
+    }
+  end
+  
+  def show
+    set_show
     respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @panel_picture}
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
 end