プライバシーポリシー設定のプレビューが正常に動かない件を修正

diff --git a/app/controllers/admin/shops_controller.rb b/app/controllers/admin/shops_controller.rb
index fa0df82..d09868b 100644 (file)
--- a/app/controllers/admin/shops_controller.rb
+++ b/app/controllers/admin/shops_controller.rb
@@ -414,9 +414,9 @@ class Admin::ShopsController < Admin::BaseController
     @preview_id = params[:preview_id]
     @privacy = Privacy.new params[:privacy]
     if @preview_id == "1" || @preview_id == "3"
-      render :template => '/admin/shops/privacy_preview_mobile', :layout => '/admin/preview_base_mobile'
+      render :template => '/admin/shops/privacy_preview_mobile', :layout => 'admin/preview_base_mobile'
     else
-      render :template => '/admin/shops/privacy_preview', :layout => '/admin/preview_base'
+      render :template => '/admin/shops/privacy_preview', :layout => 'admin/preview_base'
     end    
   end
   

diff --git a/app/helpers/base_helper.rb b/app/helpers/base_helper.rb
index 0eb6ab3..707beb5 100644 (file)
--- a/app/helpers/base_helper.rb
+++ b/app/helpers/base_helper.rb
@@ -387,9 +387,10 @@ def each_product_styles(product)
 end
 
 def image_tag_mobile(prefix, options={})
-  width = request.mobile.display.width
+  width = request.mobile.display.width if request.mobile and request.mobile.display
+  width = options[:width] if options[:width]
   size = 'q' # q = QVGA, v = VGA
-  size = 'v' if !width.blank? && width >= 480
+  size = 'v' if !width.blank? && width.to_i >= 480
   format = 'gif'
   #キャリア毎に変更するなら以下を利用する（今は使わないのでコメントアウト
   #format = 'gif' if request.mobile.is_a?(Jpmobile::Mobile::Docomo)