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

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 82145f1..492e4ce 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -3,7 +3,9 @@ class ArtistsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show, :resource_pictures]
+    before_filter :authenticate_resource_reader, :only => [
+      :index, :show
+    ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   end
@@ -26,10 +28,6 @@ class ArtistsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
   def new
     form_new
   end