t#30102:update i18n op rp au ar gc gp pc

[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 3e5d906..5f053a9 100644 (file)
--- 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"}