X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fpictures_controller.rb;h=435b481e12ac05cb04132be3d67cd5593645cc94;hb=6a9125ccbacea489311fc4cc548ac03e7d0b412d;hp=9e1bae8c35acf1ba91e2afe3ecba35cb6d8d19ed;hpb=11a45b633d577752eab730818d0b116180e18a47;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb
index 9e1bae8c..435b481e 100644
--- a/app/controllers/pictures_controller.rb
+++ b/app/controllers/pictures_controller.rb
@@ -1,15 +1,27 @@
 class PicturesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   else
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_resource_reader, :only => [:show, :credit, :search]
-    before_filter :authenticate_author, :only => []
+    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
@@ -22,8 +34,8 @@ class PicturesController < ApplicationController
       format.gif { send_data(@item.restore(params[:subdir]), opt ) }
       format.jpeg { send_data(@item.restore(params[:subdir]), opt ) }
       show_html_format format
-      show_prof_format format
       show_json_format format
+      show_prof_format format
     end
   end