mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'bug/backup-reload' into 'dev'
Reload backup page on front end - Fix & in backup path See merge request crafty-controller/crafty-4!431
This commit is contained in:
commit
138ecda9f6
@ -6,6 +6,8 @@ TBD
|
||||
- Fix reaction tasks not firing ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
|
||||
- QOL task delay offset not following over on task edit ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
|
||||
- Fix Fresh Install Detection Logic issues ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/425))
|
||||
- Fix reload issue on backup panel - on certain browsers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/431))
|
||||
- Fix '&'in backup paths ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/431))
|
||||
### Tweaks
|
||||
- Session Handling | Logout on browser close ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/424))
|
||||
- Backups Panel | Only display zips ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/426))
|
||||
|
@ -1576,7 +1576,7 @@ class PanelHandler(BaseHandler):
|
||||
else:
|
||||
checked = self.controller.management.get_excluded_backup_dirs(server_id)
|
||||
if superuser:
|
||||
backup_path = bleach.clean(self.get_argument("backup_path", None))
|
||||
backup_path = self.get_argument("backup_path", None)
|
||||
if Helpers.is_os_windows():
|
||||
backup_path.replace(" ", "^ ")
|
||||
backup_path = Helpers.wtol_path(backup_path)
|
||||
|
@ -294,6 +294,7 @@
|
||||
headers: { 'X-XSRFToken': token },
|
||||
url: '/ajax/backup_now?id=' + server_id,
|
||||
success: function (data) {
|
||||
location.reload();
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -505,11 +506,6 @@
|
||||
}
|
||||
});
|
||||
}
|
||||
if (webSocket) {
|
||||
webSocket.on('backup_reload', function (backup) {
|
||||
location.reload()
|
||||
});
|
||||
}
|
||||
|
||||
function getTreeView(path) {
|
||||
path = path
|
||||
|
Loading…
Reference in New Issue
Block a user