mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-29 22:33:01 +00:00
Code Issues Releases Wiki Activity

Cancel button in User edit now leads to the right page back #1938

Browse Source
This commit is contained in:
Ozzie Isaacs
2021-04-17 18:30:55 +02:00
parent 39bbee0eeb
commit c0a4addf30
6 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cps/static/js/main.js
View File

@@ -114,6 +114,20 @@ $(document).ready(function() {
}
});
$(".session").click(function() {
window.sessionStorage.setItem("back", window.location.pathname);
});
$("#back").click(function() {
var loc = sessionStorage.getItem("back");
if (!loc) {
loc = $(this).data("back");
}
sessionStorage.removeItem("back");
window.location.href = loc;
});
function confirmDialog(id, dialogid, dataValue, yesFn, noFn) {
var $confirm = $("#" + dialogid);
$confirm.modal('show');

6
cps/static/js/table.js
View File

@@ -600,7 +600,7 @@ function responseHandler(res) {
}
function singleUserFormatter(value, row) {
return '<a class="btn btn-default" href="' + window.location.pathname + '/../../admin/user/' + row.id + '">' + this.buttontext + '</a>'
return '<a class="btn btn-default" onclick="storeLocation()" href="' + window.location.pathname + '/../../admin/user/' + row.id + '">' + this.buttontext + '</a>'
}
function checkboxFormatter(value, row, index){
@@ -741,6 +741,6 @@ function queryParams(params)
return params;
}
function test(){
console.log("hello");
function storeLocation() {
window.sessionStorage.setItem("back", window.location.pathname);
}