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

[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 829d06f..9ad0335 100644 (file)
--- a/app/controllers/original_picture_license_groups_controller.rb
+++ b/app/controllers/original_picture_license_groups_controller.rb
@@ -1,11 +1,8 @@
 class OriginalPictureLicenseGroupsController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_user!, :only => [:new, :create]
-  before_filter :authenticate_author, :only => [:new, :create]
+  before_filter :authenticate_user, :only => [:new, :create]
   before_filter :authenticate_artist, :only => [:new, :create]
   
-  # 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()
@@ -17,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]