Merge branch 'f-boot-tour' into f-fix-117

CHANGELOG.md

@@ -46,6 +46,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)
 

src/core/js/ext_autocomplete.js

@@ -42,12 +42,47 @@ var ext_autocomplete = new function () {
         "WHICH",
         "WITH",
         "CREATED BY",
+        "CREATED BY ME",
+        "CREATED AT",
         "CREATED ON",
+        "CREATED IN",
+        "CREATED BEFORE",
+        "CREATED UNTIL",
+        "CREATED AFTER",
+        "CREATED SINCE",
         "SOMEONE",
         "STORED AT",
         "HAS A PROPERTY",
         "HAS BEEN",
         "ANY VERSION OF",
+        "FROM",
+        "INSERTED AT",
+        "INSERTED ON",
+        "INSERTED IN",
+        "INSERTED BY",
+        "INSERTED BY ME",
+        "INSERTED BEFORE",
+        "INSERTED UNTIL",
+        "INSERTED AFTER",
+        "INSERTED SINCE",
+        "UPDATED AT",
+        "UPDATED ON",
+        "UPDATED IN",
+        "UPDATED BY",
+        "UPDATED BY ME",
+        "UPDATED BEFORE",
+        "UPDATED UNTIL",
+        "UPDATED AFTER",
+        "UPDATED SINCE",
+        "SINCE",
+        "BEFORE",
+        "ON",
+        "IN",
+        "AFTER",
+        "UNTIL",
+        "AT",
+        "BY",
+        "BY ME",
     ];
     this.version = "0.1";
 

src/doc/tutorials/edit_mode.rst

@@ -183,11 +183,3 @@ stored within ``/uploaded.by/<REALM>/<USER>/``.
 The same is true for properties with data type ``REFERENCE``, too. In
 that case, the Record of the file that is uploaded will be assigned the
 RecordType of value of the original reference property.
-
-.. warning::
-
-   Until `this bug
-   <https://gitlab.indiscale.com/caosdb/src/caosdb-webui/-/issues/200>`_
-   has been fixed, the upload button is broken and does not open the
-   upload dialogue.
-

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">&times;</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">&times;</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">&times;</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);