add: resource_picture_pictures

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 3f641b4..492e4ce 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -1,15 +1,13 @@
 class ArtistsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :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_author, :only => [:new, :create, :edit, :update, :destroy]
-  end
-
-  def self.model
-    Artist
+    before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   end
   
   def index
@@ -30,10 +28,6 @@ class ArtistsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
   def new
     form_new
   end