diff --git a/CHANGELOG.md b/CHANGELOG.md index a3a721b0..3cdb181c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fix public status page not updating #255 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615)) - Fix service worker vulrn and CQ raised by SonarQ ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/631)) - Fix Backup Restore/Schedules, Backup button function on `remote-comms2` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/634)) +- Add a wait to the call for the directory so we can make sure the wait dialogue has time to show up first ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/637)) - Fix bug where a reaction loop could be created, but would be cut short by an error when the loop occurred ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/636)) ### Refactor - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585)) diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html index 4193c6d7..823a4585 100644 --- a/app/frontend/templates/server/bedrock_wizard.html +++ b/app/frontend/templates/server/bedrock_wizard.html @@ -591,7 +591,9 @@ message: '
Please wait while we gather your files...
', closeButton: false }); - getDirView(); + setTimeout(function(){ + getDirView(); + }, 2000); } else { bootbox.alert("You must input a path before selecting this button"); } @@ -638,7 +640,9 @@ message: 'Please wait while we gather your files...
', closeButton: false }); - getDirView(); + setTimeout(function(){ + getDirView(); + }, 2000); } else { bootbox.alert("You must input a path before selecting this button"); } diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 850bf505..bb5fc175 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -826,8 +826,9 @@ message: 'Please wait while we gather your files...
', closeButton: false }); - console.log("CALLING DIR") - getDirView(); + setTimeout(function(){ + getDirView(); + }, 2000); } else { bootbox.alert("You must input a path before selecting this button"); } @@ -843,8 +844,9 @@ message: 'Please wait while we gather your files...
', closeButton: false }); - console.log("CALLING DIR") - getDirView(); + setTimeout(function(){ + getDirView(); + }, 2000); }); var upload = false; var file;