top page moved

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

diff --git a/app/controllers/original_picture_license_groups_controller.rb b/app/controllers/original_picture_license_groups_controller.rb
index 8897d16..9ad0335 100644 (file)
--- a/app/controllers/original_picture_license_groups_controller.rb
+++ b/app/controllers/original_picture_license_groups_controller.rb
@@ -1,29 +1,8 @@
 class OriginalPictureLicenseGroupsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
-  before_filter :authenticate_user!, :only => [:new, :create]
+  layout 'test' if MagicNumber['test_layout']
+  before_filter :authenticate_user, :only => [:new, :create]
   before_filter :authenticate_artist, :only => [:new, :create]
   
-  private
-  
-  def authenticate_artist
-    if @author.artist?
-      true
-    else
-      respond_to do |format|
-        format.html { redirect_to new_artist_path, :status => :found }
-        format.js { render "artists/new" }
-        format.json { 
-          raise ActiveRecord::Forbidden
-        }
-      end
-      false
-    end
-  end
-  
-  public
-  
-  # GET /original_picture_license_groups/new
-  # GET /original_picture_license_groups/new.js
   def new
     @original_picture = OriginalPicture.show params[:original_picture_id], @artist
     @original_picture_license_group = OriginalPictureLicenseGroup.new()
@@ -35,8 +14,6 @@ class OriginalPictureLicenseGroupsController < ApplicationController
     end
   end
 
-  # POST /original_picture_license_groups
-  # POST /original_picture_license_groups.js
   def create
     @original_picture = OriginalPicture.show params[:original_picture_id], @artist
     @original_picture_license_group = OriginalPictureLicenseGroup.new params[:original_picture_license_group]
@@ -45,8 +22,8 @@ class OriginalPictureLicenseGroupsController < ApplicationController
 
     respond_to do |format|
       if @original_picture_license_group.valid?
-        format.html { render :template => "#{@ctl}/new" }
-        format.js { render :template => "#{@ctl}/new" }
+        format.html { render :template => "#{@ctl}/attributes/new" }
+        format.js { render :template => "#{@ctl}/attributes/new" }
       else
         format.html { render action: "new" }
         format.js { render action: "new" }