From 567d2ea4899e6dbd32e541cf4e1015607eb2fd9f Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 15 Mar 2017 13:35:48 +0000
Subject: [PATCH] SSDM-4184 : Bugfix, AND/OR Renders correctly on change event.
SVN: 37909
---
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index dd7892706c9..67d0cf952b5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -202,7 +202,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
//how to make an on-select event??
this._getNewFieldTypeDropdownComponent = function($newFieldNameContainer, entityKind, uuid) {
//Update dropdown component
- this._$andOrDropdownComponent.val("AND");
+ this._$andOrDropdownComponent.val("AND").trigger('change');
this._advancedSearchModel.criteria.logicalOperator = "AND";
this._$andOrDropdownComponent.removeAttr("disabled");
//
@@ -211,9 +211,9 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
switch(entityKind) {
case "ALL":
fieldTypeOptions = [{value : "All", label : "All", selected : true }];
- this._$andOrDropdownComponent.val("OR");
+ this._$andOrDropdownComponent.val("OR").trigger('change');
this._advancedSearchModel.criteria.logicalOperator = "OR";
- this._$andOrDropdownComponent.attr("disabled", "");
+ this._$andOrDropdownComponent.attr("disabled", "").trigger('change');
break;
case "SAMPLE":
fieldTypeOptions = [{value : "All", label : "All", selected : true },
--
GitLab