From 5dec3aba505a2ab8c3c210f19bb2441b457b1f73 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 10:49:57 -0800
Subject: [PATCH] fix download link and restore behaviour with pending

---
 domain-server/resources/web/content/js/content.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 5c2e134102..717f149760 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -126,7 +126,7 @@ $(document).ready(function(){
   var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
   var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
   var ACTIVE_BACKUP_ROW_CLASS = 'active-backup';
-  
+
   function reloadBackupInformation() {
     // make a GET request to get backup information to populate the table
     $.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>"
           + "<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_DOWNLOAD_LINK_CLASS + "' href='#'>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_DOWNLOAD_LINK_CLASS + "' href='/api/backups/" + backup.id + "'>Download</a></li><li class='divider'></li>"
+          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='#' target='_blank'>Delete</a></li></ul></div></td>";
       }
 
       function updateProgressBars($progressBar, value) {
@@ -267,12 +267,11 @@ $(document).ready(function(){
       "Restore content",
       function() {
         // 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
         $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
           swal.close();
-          showRestartModal();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
             "Error",