From a44e86ed21faf27542bcd72d67d504ee2d17d1d4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 19:00:13 +0630
Subject: [PATCH] check orgami js

---
 app/assets/javascripts/origami.js          |  6 +++---
 app/controllers/base_origami_controller.rb | 11 ++++++++---
 app/controllers/origami/home_controller.rb |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index a75779c3..8319dc10 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -389,19 +389,19 @@ function setHeaderBreadCrumb(params){
 }
 
 //show hide nav bar for webview
-function showHideNavbar(webview,page=""){
+function showHideNavbar(webview,page){
 	if(webview){
 		$("nav.navbar").addClass("hidden");
 		$("section").addClass("section-margin");
 		$(".page-loader-wrapper").addClass("hidden");
-		if(page!=""){
+		if(page!=undefined){
 			$("#back").hide();
 		}
 	}else{
 		$("nav.navbar").removeClass("hidden");
 		$("section").removeClass("section-margin");
 		$(".page-loader-wrapper").removeClass("hidden");
-		if(page!=""){
+		if(page!=undefined){
 			$("#back").show();
 		}
 	}
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index ddcdc9e2..828d0787 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -38,13 +38,18 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
+    token_status = false
     authenticate_with_http_token do |token, options|   
+      if token
+        token_status = true 
+      end
       session[:session_token] = token
     end
-
-    if session[:session_token] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
-        status = true
+    
+    if token_status && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
+      status = true
     end
+
     return status
   end
 end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 427d2a86..5ed006a1 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,6 +1,6 @@
 class Origami::HomeController < BaseOrigamiController
   authorize_resource :class => false
- before_action :set_dining, only: [:show]
+  before_action :set_dining, only: [:show]
 
   def index
     @webview = false