From 6002b06e8da45727d229bb85d2ee865dd8f99bc9 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 21 Jun 2016 10:00:38 +0000
Subject: [PATCH] SSDM-3733 : withOperator should be on AbstractComposite
instead of AbstractEntity to match Java and make some calls that where
failing work
SVN: 36717
---
.../as/dto/common/search/AbstractCompositeSearchCriteria.js | 4 ++++
.../v3/as/dto/common/search/AbstractEntitySearchCriteria.js | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
index f1f03609488..75872ba0b21 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
@@ -23,6 +23,10 @@ define([ "stjs", "as/dto/common/search/AbstractSearchCriteria", "as/dto/common/s
prototype.getOperator = function() {
return this.operator;
}
+ prototype.withOperator = function(anOperator) {
+ this.operator = anOperator;
+ return this;
+ };
prototype.withOrOperator = function() {
this.operator = SearchOperator.OR;
return this;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
index 623a4e237fc..f5196cb2255 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
@@ -14,10 +14,6 @@ define(
prototype['@type'] = 'as.dto.common.search.AbstractEntitySearchCriteria';
constructor.serialVersionUID = 1;
prototype.operator = SearchOperator.AND;
- prototype.withOperator = function(anOperator) {
- this.operator = anOperator;
- return this;
- };
prototype.getOperator = function() {
return this.operator;
};
--
GitLab