Fix a bug for listZones and listServiceOfferings for normal user, caused by a misuse of SearchCriteria class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1c71a01b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1c71a01b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1c71a01b Branch: refs/heads/marvin-refactor Commit: 1c71a01b6387ffc57696b4f00091480d1feea2e5 Parents: f435ffb Author: Min Chen <[email protected]> Authored: Wed Jan 23 10:16:17 2013 -0800 Committer: Prasanna Santhanam <[email protected]> Committed: Thu Jan 24 17:48:34 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/api/query/QueryManagerImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1c71a01b/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index a943776..cf240b1 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2131,7 +2131,7 @@ public class QueryManagerImpl implements QueryService, Manager { domainRecord = _domainDao.findById(domainRecord.getParent()); domainIds.add(domainRecord.getId()); } - sc.addAnd("domainIdIn", SearchCriteria.Op.IN, domainIds); + sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds); // include also public offering if no keyword, name and id specified if ( keyword == null && name == null && id == null ){ @@ -2261,7 +2261,7 @@ public class QueryManagerImpl implements QueryService, Manager { } // domainId == null (public zones) or domainId IN [all domain id up to root domain] SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); - sdc.addOr("domainIdIn", SearchCriteria.Op.IN, domainIds); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc); @@ -2291,7 +2291,7 @@ public class QueryManagerImpl implements QueryService, Manager { // domainId == null (public zones) or domainId IN [all domain id up to root domain] SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria(); - sdc.addOr("domainIdIn", SearchCriteria.Op.IN, domainIds); + sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds); sdc.addOr("domainId", SearchCriteria.Op.NULL); sc.addAnd("domain", SearchCriteria.Op.SC, sdc);
