Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/zip-upload' into 'dev'

Browse Source 
Fix upload root files being hidden

See merge request crafty-controller/crafty-4!590
This commit is contained in:
Iain Powrie 2023-05-29 20:34:16 +00:00
commit 69eff7ffe8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -3,9 +3,10 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix upload root files being hidden ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/590))
### Tweaks
- Send empty json for no banned/cached players ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/589)) - Send empty json for no banned/cached players ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/589))
### Tweaks
TBD
### Lang ### Lang
TBD TBD
<br><br> <br><br>

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

@ -553,6 +553,7 @@
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" id="zip_root_path" name="zip_root_path"> <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
</div> </div>
</div>
<div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true"> <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
@ -596,7 +597,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<style> <style>
button>i.refresh-class { button>i.refresh-class {
margin: 0px; margin: 0px;
@ -949,6 +949,7 @@
function show_file_tree() { function show_file_tree() {
if (upload) { if (upload) {
console.log("upload true")
$("#dir_upload_select").modal(); $("#dir_upload_select").modal();
} else { } else {
$("#dir_select").modal(); $("#dir_select").modal();