smartphone website

[elecoma/elecoma.git] / app / controllers / accounts_controller.rb

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index bed0e5d..332622a 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -80,7 +80,7 @@ class AccountsController < BaseController
         else
           # 普通に来た場合
           if request.mobile?
-            redirect_to :controller => "accounts", :action=>"myindex_mobile"# '/account/myindex_mobile'
+            redirect_to :controller => "accounts", :action=>"myindex"# '/account/myindex_mobile'
           else
             redirect_to :controller => "portal", :action => "show"
           end
@@ -108,11 +108,11 @@ class AccountsController < BaseController
 
   # モバイル専用規約入口
   def kiyaku_intro
-    redirect_to :action => :kiyaku unless request.mobile?
+    redirect_to :action => :kiyaku unless request.mobile? && !request.mobile.respond_to?('smartphone?')
   end
 
   def kiyaku
-    params[:position] ||= 1 if request.mobile?
+    params[:position] ||= 1 if request.mobile? && !request.mobile.respond_to?('smartphone?')
     # 章を指定されたらそこだけ出す。さもなくば全て。
     if params[:position]
       kiyaku = Kiyaku.find_by_position(params[:position])
@@ -141,7 +141,7 @@ class AccountsController < BaseController
   def signup_confirm
     @customer = Customer.new
     get_customer
-    @customer.editting = false if request.mobile?
+    @customer.editting = false if request.mobile? && !request.mobile.respond_to?('smartphone?')
     unless @customer.valid?
       render :action => :signup
       return