X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Foriginal_pictures_controller.rb;h=5f053a95b3ae886da0aa8ef2f869cae740a47c22;hb=d8a82884effe9d5f500400351164f1ce21c22f67;hp=3e5d9068650c52f9fb3eb6be2364a8c7ed65437f;hpb=97850a27ff412de6ea4230e51a9cca4d92d62ca8;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 3e5d9068..5f053a95 100644
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,6 +1,6 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :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 +21,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"}