X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fpictures_controller.rb;h=62be192af5f57b6648a346d1ba9d1b6cdfe37fa9;hb=87dc80d4ea2b9b1cfb5273c403b50c001225a61a;hp=4fe261a5aafdd3dc1ad52750bee2208a80cbdfd8;hpb=93b359296a4d2da735cf200bea2476c2dffcee3f;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb
index 4fe261a5..62be192a 100644
--- a/app/controllers/pictures_controller.rb
+++ b/app/controllers/pictures_controller.rb
@@ -1,27 +1,60 @@
 class PicturesController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
-  before_filter :authenticate_user!, :only => [:show, :credit]
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
+  else
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_resource_reader, :only => [
+      :show, :credit, :search
+    ]
+    before_action :authenticate_author, :only => []
+  end
+  before_action :authenticate_admin, :only => [:index, :by_artist ]
+  
+  def index
+    filer_list
+  end
+  
+  def by_artist
+    filer_list param: params[:id]
+  end
+  
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @picture = @item
+    }
+  end
   
   def show
-    @picture = Picture.show(params[:id], @author)
-
+    set_show
     respond_to do |format|
-      opt = {:type => @picture.mime_type, :disposition=>"inline"}
-      format.png { send_data(@picture.restore(params[:subdir]), opt ) }
-      format.gif { send_data(@picture.restore(params[:subdir]), opt ) }
-      format.jpeg { send_data(@picture.restore(params[:subdir]), opt ) }
-      format.html 
-      format.json { render :json => @picture.to_json}
+      opt = {:type => @item.mime_type, :disposition=>"inline"}
+      format.png { send_data(@item.restore(params[:subdir]), opt ) }
+      format.gif { send_data(@item.restore(params[:subdir]), opt ) }
+      format.jpeg { send_data(@item.restore(params[:subdir]), opt ) }
+      show_html_format format
+      show_json_format format
+      show_prof_format format
     end
   end
   
   def credit
-    @picture = Picture.show(params[:id], @author)
-
+    @picture = Picture.show(params[:id], @operators)
+    
     respond_to do |format|
-      format.html { render :layout => false } # show.html.erb
+      format.html { render :layout => false }
       format.json { render :json => @picture.to_json}
     end
   end
   
+  def search
+    @pictures = Picture.find_by_md5(params[:md5])
+    
+    respond_to do |format|
+      format.html
+      format.json { render json: @pictures.to_json }
+    end
+  end
+  
 end