diff --git a/CHANGELOG.md b/CHANGELOG.md index b9dbf5f4a7ae168c3d1efe819fdd514b1fe82453..61b8e1d8854cc79d4937720acfc153d2663fc806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- #212 - form_elements: Drop-down menu shows wrong value after clicking "None" - #202 - Make filter fields in edit mode toolbox visible - #117 - Reload data model after adding an RT or a Property * #214 - Paging panel is hidden. diff --git a/Makefile b/Makefile index 2c12ee4e67becfd7713ae305c4ab7432bda84391..6d6cc56b8617cd30dcd0463318c74b7a8dd8ce61 100644 --- a/Makefile +++ b/Makefile @@ -218,10 +218,10 @@ $(LIBS_DIR)/fonts: unzip ln -s $(LIBS_DIR)/bootstrap-icons-1.4.1/fonts/ $@ $(LIBS_DIR)/js/bootstrap.js: unzip $(LIBS_DIR)/js - ln -s $(LIBS_DIR)/bootstrap-5.0.0-beta3-dist/js/bootstrap.min.js $@ + ln -s $(LIBS_DIR)/bootstrap-5.0.1-dist/js/bootstrap.min.js $@ $(LIBS_DIR)/css/bootstrap.css: unzip $(LIBS_DIR)/css - ln -s $(LIBS_DIR)/bootstrap-5.0.0-beta3-dist/css/bootstrap.min.css $@ + ln -s $(LIBS_DIR)/bootstrap-5.0.1-dist/css/bootstrap.min.css $@ $(LIBS_DIR)/css/bootstrap-icons.css: unzip $(LIBS_DIR)/css ln -s $(LIBS_DIR)/bootstrap-icons-1.4.1/bootstrap-icons.css $@ diff --git a/libs/bootstrap-5.0.0-beta3-dist.zip b/libs/bootstrap-5.0.0-beta3-dist.zip deleted file mode 100644 index c10719c59c4b76cf71ad04985feee6b5cbf73bcd..0000000000000000000000000000000000000000 Binary files a/libs/bootstrap-5.0.0-beta3-dist.zip and /dev/null differ diff --git a/libs/bootstrap-5.0.1-dist.zip b/libs/bootstrap-5.0.1-dist.zip new file mode 100644 index 0000000000000000000000000000000000000000..196a8212a471170f120de352455dbcf9f3466639 Binary files /dev/null and b/libs/bootstrap-5.0.1-dist.zip differ diff --git a/misc/unit_test_http_server.py b/misc/unit_test_http_server.py index 68e6a7434a584a26a242e5891329f3fb6c6d159f..56205df8d34491b865698742f6b24b1679894df8 100755 --- a/misc/unit_test_http_server.py +++ b/misc/unit_test_http_server.py @@ -153,5 +153,5 @@ class UnitTestHTTPServer(HTTPServer): os._exit(self._exit_code)#pylint: disable=protected-access -UnitTestHTTPServer(server_address=('127.0.0.1', int(sys.argv[1])), +UnitTestHTTPServer(server_address=('0.0.0.0', int(sys.argv[1])), timeout=float(sys.argv[2]), ignore_done=(sys.argv[3] == "True")).start() diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css index cecc8e5bfdf3191f4138c3a3df6f29f9fef9bfeb..ce6e47348f0ec4fa5da501c04cbd3ecb667e6389 100644 --- a/src/core/css/webcaosdb.css +++ b/src/core/css/webcaosdb.css @@ -746,3 +746,13 @@ details p { .caosdb-f-map-panel .leaflet-container { height: 500px; } + +.caosdb-v-field .bootstrap-select button { + border: 1px solid #ced4da; + background-color: #FFF; +} + +.caosdb-v-field > div { + margin-top: auto; + margin-bottom: auto; +} diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js index 94607ab01a906ded9999bbfef00340d5818838f4..d01b45ee9148febc592d615a8fa947d0d53656d3 100644 --- a/src/core/js/form_elements.js +++ b/src/core/js/form_elements.js @@ -519,7 +519,7 @@ var form_elements = new function () { let label = this._make_input_label_str(config); let loading = $(createWaitingNotification("loading...")) .addClass("caosdb-f-field-not-ready"); - let input_col = $('<div class="col-sm-9"/>'); + let input_col = $('<div class="caosdb-f-property-value col-sm-9"/>'); input_col.append(loading); this._query(config.query).then(async function (entities) { @@ -559,7 +559,6 @@ var form_elements = new function () { select_picker_options["liveSearchNormalize"] = true; select_picker_options["liveSearchPlaceholder"] = "search..."; } - console.log(select) $(select).selectpicker(select_picker_options); $(select).selectpicker("val", value); this.init_actions_box(field); @@ -577,7 +576,7 @@ var form_elements = new function () { if (actions_box.length === 0) { actions_box = $(`<div class="bs-actionsbox"> <div class="btn-group btn-group-sm d-grid"> - <button type="button" class="actions-btn btn-secondary bs-deselect-all btn btn-light">None</button> + <button type="button" class="actions-btn bs-deselect-all btn btn-light">None</button> </div> </div>`) .hide(); @@ -599,9 +598,11 @@ var form_elements = new function () { actions_box .find(".bs-deselect-all") .click((e) => { - select.val(null) - .selectpicker("render") - .parent().toggleClass("open", false); + select + .selectpicker("val", null); + select + .selectpicker("render"); + select.dropdown("hide"); select[0].dispatchEvent(form_elements.field_changed_event); }); } @@ -1297,7 +1298,7 @@ var form_elements = new function () { */ this._make_field_wrapper = function (name) { caosdb_utils.assert_string(name, "param `name`"); - return $('<div class="row caosdb-f-field" data-field-name="' + name + '" />')[0]; + return $('<div class="row caosdb-f-field caosdb-v-field" data-field-name="' + name + '" />')[0]; } /**