git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove turbolink in backend and update logout

Browse Source
This commit is contained in:
Yan
2017-10-30 18:51:05 +06:30
parent da0558b5ef
commit 35161aae91
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/custom.js
View File

@@ -38,8 +38,10 @@ $(document).ready(function() {
type: method, type: method,
url: url , url: url ,
success: function(data) { success: function(data) {
// console.log(data.url);
location.href = data.url;
} }
}); });
} else { } else {
swal("Cancelled", "Your imaginary file is safe :)", "error"); swal("Cancelled", "Your imaginary file is safe :)", "error");
} }

1
app/assets/javascripts/login.js
View File

@@ -15,6 +15,5 @@
//= require tether //= require tether
//= require bootstrap/js/popper.min //= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require turbolinks
//= require node-waves/waves.js //= require node-waves/waves.js
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js

3
app/controllers/home_controller.rb
View File

@@ -84,7 +84,8 @@ class HomeController < ApplicationController
# clear in employee session # clear in employee session
Employee.logout(session[:session_token]) Employee.logout(session[:session_token])
session[:session_token] = nil session[:session_token] = nil
redirect_to root_path # redirect_to root_path
render :json => {:status=> "Success", :url => root_path }.to_json
end end
private private

2
app/views/layouts/login.html.erb
View File

@@ -100,7 +100,7 @@
<% end %> <% end %>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).on('turbolinks:load', function () { $(document).ready(function () {
$("#login_form_password").focus(); $("#login_form_password").focus();
$(".pin_pad").click(function (event) { $(".pin_pad").click(function (event) {

2
app/views/layouts/login_dashboard.html.erb
View File

@@ -155,7 +155,7 @@
</html> </html>
<script> <script>
$(document).on('turbolinks:load', function () { $(document).ready(function () {
// for Notificaiotn message // for Notificaiotn message