diff --git a/CHANGELOG.md b/CHANGELOG.md index 57472cad21ba770edb8f7a2eb0894936d1be0ed8..6e328fa9b7d9622c34c231bd4bd6c29949c37557 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Displaying issues with long lists in property values * An issue whereby a grey container would appear above the map when changing the map view. +* #200 - Re-enabled the file-upload button ### Security (in case of vulnerabilities) diff --git a/src/ext/js/fileupload.js b/src/ext/js/fileupload.js index 4e9f7cd02a4f3c5e63080f1e520c10a9328bfe22..31d86589286f1761f481cc9d9bb6a557a63cbce1 100644 --- a/src/ext/js/fileupload.js +++ b/src/ext/js/fileupload.js @@ -25,18 +25,31 @@ var fileupload = new function() { // TODO * action to config * upload-path id -> class * message configurable // * style path input - const _modal_str = ` <div class="modal fade" tabindex="-1" role="dialog"> - <div class="modal-dialog modal-lg" role="document"> <div - class="modal-content"> <div class="modal-header"> <button type="button" - class="btn-close" data-bs-dismiss="modal">×</button> <h4 - class="modal-title">File Upload</h4> </div> <div class="modal-body"> <form - action="/Entity/" class="dropzone dz-clickable" > <label>path</label><input - id="upload-path" type="text" value="/"/> <div class="dz-message"> - Drag'n'drop files to this area or click to upload. </div> </form> </div> - <div class="modal-footer"> <button type="button" class="btn btn-secondary - caosdb-f-file-upload-submit-button">Ok</button> <button type="button" - class="btn btn-secondary" data-bs-dismiss="modal">Close</button> </div> </div> - </div> </div>`; + const _modal_str = ` +<div class="modal fade" tabindex="-1" role="dialog"> + <div class="modal-dialog modal-lg" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h4 class="modal-title">File Upload</h4> + <button type="button" class="btn-close" data-bs-dismiss="modal"> + </button> + </div> + <div class="modal-body"> + <form action="/Entity/" class="dropzone dz-clickable" > + <label>path</label> + <input id="upload-path" type="text" value="/"/> + <div class="dz-message"> + Drag'n'drop files to this area or click to upload. + </div> + </form> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary caosdb-f-file-upload-submit-button">Ok</button> + <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> + </div> + </div> + </div> +</div>`; /** Create a dropzone.js form for the file upload. */ @@ -122,7 +135,7 @@ var fileupload = new function() { input.after(`<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="btn-close" data-bs-dismiss="alert" - aria-label="Close"><span aria-hidden="true">×</span></button> + aria-label="Close"></button> <strong>Error!</strong> You are not logged in!.</div>`); } else { globalError(event, error, xhr); @@ -188,7 +201,7 @@ var fileupload = new function() { input.after(`<div class="alert alert-success alert-dismissible" role="alert"> <button type="button" class="btn-close" data-bs-dismiss="alert" - aria-label="Close"><span aria-hidden="true">×</span></button> + aria-label="Close"></button> <strong>Success!</strong> The file <code class="caosdb-f-file-upload-file-name">` + getEntityName(entity) + `</code> has been uploaded.</div>`); @@ -308,7 +321,7 @@ var fileupload = new function() { error_handler, atom_par); var toggle_function = function() { - $(modal).modal() + $(modal).modal("toggle"); }; this.add_file_upload_button(edit_menu, button, toggle_function);