diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java index b1af693ab96bab3a8d22a1ec8513ad3f12aad553..b9ebd67c7710c4474c6b1551481df9db26afa2f2 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java @@ -21,7 +21,7 @@ import java.util.Collections; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.NoSampleContainerSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.NoSampleSearchCriteria; -import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.OnlyListableSeachCriteria; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.OnlyListableSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleChildrenSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleContainerSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleParentsSearchCriteria; @@ -52,7 +52,7 @@ public class SampleSearchCriteriaTranslator extends AbstractCompositeSearchCrite { return criteria instanceof SampleSearchCriteria || criteria instanceof NoSampleSearchCriteria - || criteria instanceof OnlyListableSeachCriteria; + || criteria instanceof OnlyListableSearchCriteria; } @Override @@ -71,7 +71,7 @@ public class SampleSearchCriteriaTranslator extends AbstractCompositeSearchCrite } return new SearchCriteriaTranslationResult(new DetailedSearchSubCriteria(entityKind, null)); - } else if (criteria instanceof OnlyListableSeachCriteria) + } else if (criteria instanceof OnlyListableSearchCriteria) { SimpleAttributeSearchFieldKind attributeFieldKind = new SimpleAttributeSearchFieldKind(SearchFieldConstants.PREFIX_ENTITY_TYPE + SearchFieldConstants.IS_LISTABLE, "listable"); DetailedSearchField createAttributeField = DetailedSearchField.createAttributeField(attributeFieldKind); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js index bce2d8624914cddf47988ddd741eb215887649a1..cd7239c63ba15fbafd33dc5d3d93c9c1fcbfb530 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js @@ -2,11 +2,11 @@ * @author pkupczyk */ define([ "stjs", "as/dto/sample/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) { - var OnlyListableSeachCriteria = function() { + var OnlyListableSearchCriteria = function() { }; - stjs.extend(AbstractCompositeSearchCriteria, OnlyListableSeachCriteria, [ OnlyListableSeachCriteria ], function(constructor, prototype) { - prototype['@type'] = 'as.dto.sample.search.OnlyListableSeachCriteria'; + stjs.extend(AbstractCompositeSearchCriteria, OnlyListableSearchCriteria, [ OnlyListableSearchCriteria ], function(constructor, prototype) { + prototype['@type'] = 'as.dto.sample.search.OnlyListableSearchCriteria'; constructor.serialVersionUID = 1; }, {}); - return OnlyListableSeachCriteria; + return OnlyListableSearchCriteria; }) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js index 13d609c3518ffcdd929c91a29c3fe68a9750decf..6992f4a362e2dc65d1321d1c14862de8c065d716 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js @@ -3,7 +3,7 @@ */ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/sample/search/SampleSearchRelation", "as/dto/space/search/SpaceSearchCriteria", "as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria", - "as/dto/sample/search/NoSampleContainerSearchCriteria", "as/dto/sample/search/OnlyListableSeachCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) { + "as/dto/sample/search/NoSampleContainerSearchCriteria", "as/dto/sample/search/OnlyListableSearchCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) { var SampleSearchCriteria = function(relation) { AbstractEntitySearchCriteria.call(this); @@ -39,8 +39,8 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", return this.addCriteria(new NoSampleContainerSearchCriteria()); }; prototype.withListableOnly = function() { - var OnlyListableSeachCriteria = require("as/dto/sample/search/OnlyListableSeachCriteria"); - return this.addCriteria(new OnlyListableSeachCriteria()); + var OnlyListableSearchCriteria = require("as/dto/sample/search/OnlyListableSearchCriteria"); + return this.addCriteria(new OnlyListableSearchCriteria()); }; prototype.withOrOperator = function() { return this.withOperator(SearchOperator.OR);