From e9a77ce5be48b4c5831eb25d37f83cba38428e3e Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Thu, 23 Aug 2018 15:10:39 +0200
Subject: [PATCH] SSDM-7071: select2 for operation 'Create Object' and
'Settings'
---
.../webapps/eln-lims/html/js/controllers/MainController.js | 5 +++--
.../eln-lims/html/js/views/SampleTable/SampleTableView.js | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index f2636c514f4..d8d87a17dde 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -843,9 +843,10 @@ function MainController(profile) {
settingsForDropdown.push({ label: settingsObjects[sIdx].identifier, value: settingsObjects[sIdx].identifier})
}
- var $dropdown = FormUtil.getDropdown(settingsForDropdown, "Select settigs");
+ var $dropdown = FormUtil.getDropdown(settingsForDropdown, "Select settings");
$dropdown.attr("id", "settingsDropdown");
- Util.blockUI("Select settings: <br><br>" + $dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='settingsDropdownCancel'>Cancel</a>");
+ Util.blockUI($dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='settingsDropdownCancel'>Cancel</a>");
+ $("#settingsDropdown").select2({ width: '100%', theme: "bootstrap" });
$("#settingsDropdown").on("change", function(event) {
var sampleIdentifier = $("#settingsDropdown")[0].value;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
index 8926c735710..7534aedb553 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
@@ -193,7 +193,8 @@ function SampleTableView(sampleTableController, sampleTableModel) {
this.createNewSample = function(experimentIdentifier) {
var _this = this;
var $dropdown = FormUtil.getSampleTypeDropdown("sampleTypeDropdown", true);
- Util.blockUI("Select the type for the " + ELNDictionary.Sample + ": <br><br>" + $dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='sampleTypeDropdownCancel'>Cancel</a>");
+ Util.blockUI($dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='sampleTypeDropdownCancel'>Cancel</a>");
+ $("#sampleTypeDropdown").select2({ width: '100%', theme: "bootstrap" });
$("#sampleTypeDropdown").on("change", function(event) {
var sampleTypeCode = $("#sampleTypeDropdown")[0].value;
--
GitLab