From 55faf97379707c9aa2f3ec66792f16090ed1145b Mon Sep 17 00:00:00 2001 From: Saurabh Bhatia Date: Tue, 8 Apr 2014 11:32:44 +0800 Subject: [PATCH] Added a condition for mobile api false and mobile site on --- app/controllers/application_controller.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c9e3c86..e53197b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -481,8 +481,7 @@ class ApplicationController < ActionController::Base end request.format = :mobile if mobile_device? elsif (@site.mobile_on.eql?(false) && @site.mobile_api_openness_on.eql?(true)) - mobile_app_path = "/mobile/app" - mobile_path = "/mobile" + session[:mobile_param] = if (request.path.eql?(@mobile_app_path)) '1' elsif request.path.eql?(@mobile_path) @@ -494,9 +493,21 @@ class ApplicationController < ActionController::Base end request.format = :mobile if mobile_device? + elsif (@site.mobile_on.eql?(true) && @site.mobile_api_openness_on.eql?(false)) + + session[:mobile_param] = if (request.path.eql?(@mobile_path)) + '1' + elsif request.path.eql?(@mobile_app_path) + redirect_to root_path(mobile: 0) + elsif params[:mobile] + params[:mobile] + else + session[:mobile_param] + end + request.format = :mobile if mobile_device? + elsif (@site.mobile_on.eql?(false) && @site.mobile_api_openness_on.eql?(false)) - mobile_app_path = "/mobile/app" - mobile_path = "/mobile" + session[:mobile_param] = if (request.path.eql?(@mobile_app_path)) redirect_to root_path(mobile: 0) elsif request.path.eql?(@mobile_path)