t#30200:update i18n devise

[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 1896730..d3910c8 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,7 +1,8 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
+  before_filter :authenticate_author, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   before_filter :authenticate_artist, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
   
@@ -21,7 +22,7 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1
   # GET /original_pictures/1.json
   def show
-    @original_picture = OriginalPicture.show(params[:id], @artist)
+    @original_picture = OriginalPicture.show(params[:id], @admin || @artist)
     
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
@@ -80,7 +81,7 @@ class OriginalPicturesController < ApplicationController
 
   # GET /original_pictures/1/edit
   def edit
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
     respond_to do |format|
       format.html
       format.js
@@ -109,11 +110,12 @@ class OriginalPicturesController < ApplicationController
   # PUT /original_pictures/1
   # PUT /original_pictures/1.json
   def update
-    @picture_data = set_image params[:original_picture][:file]
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @imager = PettanImager.load set_image params[:original_picture][:file]
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture.overwrite @artist
 
     respond_to do |format|
-      if @original_picture.store(@picture_data, @artist)
+      if @original_picture.store(@imager)
         format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
         format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
       else
@@ -126,7 +128,7 @@ class OriginalPicturesController < ApplicationController
   # DELETE /original_pictures/1
   # DELETE /original_pictures/1.json
   def destroy
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
     OriginalPicture.transaction do
       @original_picture.destroy
     end