Merge branch 'bugfix/support-log-x' into 'dev'

Fix support log x button still downloading

See merge request crafty-controller/crafty-4!679

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Fix Unban button failing to pardon users ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/671))
 - Fix stack in API error handling ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/674))
 - Fix bug where you cannot select "do not monitor mounts" from `config.json` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/678))
+- Fix support log 'x' button still downloading logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/679))
 ### Tweaks
 - Homogenize Panel logos/branding ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/666))
 - Retain previous tab when revisiting server details page (#272)([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/667))

app/frontend/templates/base.html

@@ -384,18 +384,21 @@
         if (x) {
           x.remove()
         }
-        bootbox.alert({
+        bootbox.confirm({
           title: "{{ translate('notify', 'downloadLogs', data['lang']) }}",
           message: "{{ translate('notify', 'finishedPreparing', data['lang']) }}",
           buttons: {
-            ok: {
+            confirm: {
               label: 'Download',
               className: 'btn-info'
             }
           },
-          callback: function () {
-            console.log("in callback")
-            location.href = "/panel/download_support_package";
+          callback: function (result) {
+            if (result){
+              location.href = "/panel/download_support_package";
+            } else {
+              bootbox.close();
+            }
           }
         });
       });
@@ -605,4 +608,4 @@
 
 </body>
 
-</html>
+</html>