merge v04

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

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 31b3ca1..c5bb41a 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,4 +1,5 @@
 class OriginalPicturesController < ApplicationController
+  layout 'test' if Pettanr::TestLayout
   before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   before_filter :authenticate_artist, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
@@ -47,13 +48,17 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1.json
   def show
     @original_picture = OriginalPicture.show(params[:id], @artist)
-
+    
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
       format.png { send_data(@original_picture.restore, opt ) }
       format.gif { send_data(@original_picture.restore, opt ) }
       format.jpeg { send_data(@original_picture.restore, opt ) }
-      format.html # show.html.erb
+      format.html {
+        #ライセンス付与のために原画ライセンスグループ作成準備
+        @original_picture_license_group  = OriginalPictureLicenseGroup.new :original_picture_id => @original_picture.id
+        render
+      }
       format.json { render json: @original_picture.to_json(OriginalPicture.show_json_include_opt)}
     end
   end
@@ -115,7 +120,7 @@ class OriginalPicturesController < ApplicationController
     @original_picture.supply_default @artist
 
     respond_to do |format|
-      if @original_picture.store(@picture_data, @artist, params[:original_picture][:license_id])
+      if @original_picture.store(@picture_data, @artist)
         format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
         format.json { render json: @original_picture, status: :created, location: @original_picture }
       else
@@ -129,11 +134,11 @@ class OriginalPicturesController < ApplicationController
   # PUT /original_pictures/1.json
   def update
     @picture_data = set_image params[:original_picture][:file]
-    @original_picture = OriginalPicture.show(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @author)
     @original_picture.supply_default @artist
 
     respond_to do |format|
-      if @original_picture.store(@picture_data, @artist, params[:original_picture][:license_id])
+      if @original_picture.store(@picture_data, @artist)
         format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
         format.json { render json: @original_picture, status: :created, location: @original_picture }
       else
@@ -146,7 +151,7 @@ class OriginalPicturesController < ApplicationController
   # DELETE /original_pictures/1
   # DELETE /original_pictures/1.json
   def destroy
-    @original_picture = OriginalPicture.find(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @author)
     OriginalPicture.transaction do
       @original_picture.destroy
     end