From 35161aae91897e3400b53f38836da8154bb3ce5e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 30 Oct 2017 18:51:05 +0630
Subject: [PATCH] remove turbolink in backend and update logout

---
 app/assets/javascripts/custom.js           | 4 +++-
 app/assets/javascripts/login.js            | 1 -
 app/controllers/home_controller.rb         | 3 ++-
 app/views/layouts/login.html.erb           | 2 +-
 app/views/layouts/login_dashboard.html.erb | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index e33ed566..91d4cc41 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -38,8 +38,10 @@ $(document).ready(function() {
             type: method,
             url: url ,            
             success: function(data) {
+              // console.log(data.url);
+              location.href = data.url;
             }
-         }); 
+         });          
         } else {
             swal("Cancelled", "Your imaginary file is safe :)", "error");
         }
diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index db75a715..f2df2d03 100755
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -15,6 +15,5 @@
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require turbolinks
 //= require node-waves/waves.js
 //= require BSBMaterial/admin.js
\ No newline at end of file
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 24c4aceb..71ed8d07 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -84,7 +84,8 @@ class HomeController < ApplicationController
     # clear in employee session
     Employee.logout(session[:session_token])
     session[:session_token] = nil
-    redirect_to root_path
+    # redirect_to root_path
+    render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
   private
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 213fe705..e9be4a3f 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -100,7 +100,7 @@
             <% end %>
     </div>
     <script type="text/javascript">
-        $(document).on('turbolinks:load', function () {
+        $(document).ready(function () {
             $("#login_form_password").focus();
 
             $(".pin_pad").click(function (event) {
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 060d4739..0338f614 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -155,7 +155,7 @@
 </html>
 
 <script>   
-    $(document).on('turbolinks:load', function () {
+    $(document).ready(function () {
 
          // for Notificaiotn message