Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix download link and restore behaviour with pending

Browse source
This commit is contained in:
Stephen Birarda 2018-02-16 10:49:57 -08:00
parent faacd986b3
commit 5dec3aba50
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
domain-server/resources/web/content/js/content.js
View file

@ -126,7 +126,7 @@ $(document).ready(function(){
var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup'; var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
var BACKUP_DELETE_LINK_CLASS = 'delete-backup'; var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
var ACTIVE_BACKUP_ROW_CLASS = 'active-backup'; var ACTIVE_BACKUP_ROW_CLASS = 'active-backup';
function reloadBackupInformation() { function reloadBackupInformation() {
// make a GET request to get backup information to populate the table // make a GET request to get backup information to populate the table
$.ajax({ $.ajax({
@ -151,8 +151,8 @@ $(document).ready(function(){
+ "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>" + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
+ "<ul class='dropdown-menu dropdown-menu-right'>" + "<ul class='dropdown-menu dropdown-menu-right'>"
+ "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>" + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
+ "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>" + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='/api/backups/" + backup.id + "'>Download</a></li><li class='divider'></li>"
+ "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backup.id + "' target='_blank'>Delete</a></li></ul></div></td>"; + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='#' target='_blank'>Delete</a></li></ul></div></td>";
} }
function updateProgressBars($progressBar, value) { function updateProgressBars($progressBar, value) {
@ -267,12 +267,11 @@ $(document).ready(function(){
"Restore content", "Restore content",
function() { function() {
// show a spinner while we send off our request // show a spinner while we send off our request
showSpinnerAlert("Restoring Content Archive " + backupName); showSpinnerAlert("Starting restore of " + backupName);
// setup an AJAX POST to request content restore // setup an AJAX POST to request content restore
$.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) { $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
swal.close(); swal.close();
showRestartModal();
}).fail(function(jqXHR, textStatus, errorThrown) { }).fail(function(jqXHR, textStatus, errorThrown) {
showErrorMessage( showErrorMessage(
"Error", "Error",