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

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

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index d73715e..3ae4dac 100644 (file)
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -1,28 +1,40 @@
 class PanelPicturesController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
-  before_filter :authenticate_user!, :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 by_panel
+    filer_list
+  end
+  
+  def by_author
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      @panel_picture = @item
+    }
   end
-
-  def list
-    @panel_pictures = PanelPicture.all
-
+  
+  def show
+    set_show
     respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @panel_pictures }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
 end