NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-18 17:15:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/gathering-files' into 'dev'

Browse Source 
Gathering Files Dialogue

See merge request crafty-controller/crafty-4!637
This commit is contained in:
Iain Powrie 2023-10-07 16:01:26 +00:00
commit 9c62789d1d
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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))

8
app/frontend/templates/server/bedrock_wizard.html
View File

@ -591,7 +591,9 @@
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false
});
getDirView();
setTimeout(function(){
getDirView();
}, 2000);
} else {
bootbox.alert("You must input a path before selecting this button");
}
@ -638,7 +640,9 @@
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false
});
getDirView();
setTimeout(function(){
getDirView();
}, 2000);
} else {
bootbox.alert("You must input a path before selecting this button");
}

10
app/frontend/templates/server/wizard.html
View File

@ -826,8 +826,9 @@
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
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: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false
});
console.log("CALLING DIR")
getDirView();
setTimeout(function(){
getDirView();
}, 2000);
});
var upload = false;
var file;