diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9e98ade..31954e6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -472,14 +472,12 @@ class ApplicationController < ActionController::Base if (@site.mobile_on.eql?(true) && @site.mobile_api_openness_on.eql?(true)) - session[:mobile_param] = if request.path.eql?(@mobile_path) - '1' - elsif (request.path.eql?(root_path) && mobile_device?) - redirect_to mobile_path + session[:mobile_param] = if request.path =~ /mobile/ + '1' elsif params[:mobile] - params[:mobile] + params[:mobile] else - session[:mobile_param] + session[:mobile_param] end request.format = :mobile if mobile_device? @@ -501,7 +499,6 @@ class ApplicationController < ActionController::Base session[:mobile_param] = if (request.path.eql?(@mobile_path)) '1' - elsif (request.path.eql?(@mobile_app_path) && mobile_device?) redirect_to root_path(mobile: 0) elsif params[:mobile] diff --git a/config/routes.rb b/config/routes.rb index b881e85..b1c81d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -416,19 +416,7 @@ Orbit::Application.routes.draw do end end - scope '/mobile/:app' do - match '/announcement' => 'mobile#announcement', :as => 'mobile_announcement' - match '/announcement_content/:id' => 'mobile#announcement_content', :as => 'mobile_announcement_content' - match '/dialog_contact' => 'mobile#dialog_contact', :as => 'mobile_dialog_contact' - match '/dialog_copyright' => 'mobile#dialog_copyright', :as => 'mobile_dialog_copyright' - match '/dialog_language' => 'mobile#dialog_language', :as => 'mobile_dialog_language' - match '/map' => 'mobile#map', :as => 'mobile_map' - match '/page' => 'mobile#page', :as => 'mobile_page' - match '/page_content/:id' => 'mobile#page_content', :as => 'mobile_page_content' - root :to => 'mobile#index', :as => 'mobile' - end - - scope '/mobile' do + scope '/mobile(/:app)' do match '/announcement' => 'mobile#announcement', :as => 'mobile_announcement' match '/announcement_content/:id' => 'mobile#announcement_content', :as => 'mobile_announcement_content' match '/dialog_contact' => 'mobile#dialog_contact', :as => 'mobile_dialog_contact'