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 %>