From ed293c09b69ca76de9d022dc21e74a07b1c1fe30 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 20 Nov 2017 10:37:50 +0000
Subject: [PATCH] SSDM-5626 : Advance search, bugfixes
SVN: 38915
---
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 4 ++++
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 1 +
2 files changed, 5 insertions(+)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 63f28ecb21d..95622b94662 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -1025,6 +1025,7 @@ function ServerFacade(openbisServer) {
switch(comparisonOperator) {
case "thatEqualsUserId":
criteria.withRegistrator().withUserId().thatEquals(attributeValue);
+ break;
case "thatContainsFirstName":
criteria.withRegistrator().withFirstName().thatContains(attributeValue);
break;
@@ -1039,6 +1040,7 @@ function ServerFacade(openbisServer) {
switch(comparisonOperator) {
case "thatEqualsDate":
criteria.withRegistrationDate().thatEquals(attributeValue);
+ break;
case "thatIsLaterThanOrEqualToDate":
criteria.withRegistrationDate().thatIsLaterThanOrEqualTo(attributeValue);
break;
@@ -1055,6 +1057,7 @@ function ServerFacade(openbisServer) {
switch(comparisonOperator) {
case "thatEqualsUserId":
criteria.withModifier().withUserId().thatEquals(attributeValue);
+ break;
case "thatContainsFirstName":
criteria.withModifier().withFirstName().thatContains(attributeValue);
break;
@@ -1069,6 +1072,7 @@ function ServerFacade(openbisServer) {
switch(comparisonOperator) {
case "thatEqualsDate":
criteria.withModificationDate().thatEquals(attributeValue);
+ break;
case "thatIsLaterThanOrEqualToDate":
criteria.withModificationDate().thatIsLaterThanOrEqualTo(attributeValue);
break;
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 867fe816ddf..9fdbf30e08e 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
@@ -384,6 +384,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
var selectedValue = $thisComponent.val();
_this._advancedSearchModel.criteria.rules[uuid].operator = selectedValue; //Update model
});
+ comparisonDropdown.trigger("change");
$newFieldOperatorContainer.append(comparisonDropdown);
--
GitLab