Updated Branches: refs/heads/master bd67ccdd6 -> 5e14e1692
CLOUDSTACK-5063 Disk offering tied to a compute offering should not shown in disk offering section Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e14e169 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e14e169 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e14e169 Branch: refs/heads/master Commit: 5e14e1692d3f31fccff14d66f0fa1a910398a3f8 Parents: bd67ccd Author: Bharat Kumar <[email protected]> Authored: Tue Nov 12 14:09:22 2013 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue Nov 12 15:15:35 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e14e169/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 2b5b81d..f251000 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -27,6 +27,7 @@ import javax.ejb.Local; import javax.inject.Inject; import com.cloud.hypervisor.Hypervisor; +import com.cloud.storage.DiskOfferingVO; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO; import org.apache.cloudstack.affinity.AffinityGroupResponse; @@ -2273,6 +2274,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Filter searchFilter = new Filter(DiskOfferingJoinVO.class, "sortKey", isAscending, cmd.getStartIndex(), cmd.getPageSizeVal()); SearchCriteria<DiskOfferingJoinVO> sc = _diskOfferingJoinDao.createSearchCriteria(); + sc.addAnd("type", Op.EQ, DiskOfferingVO.Type.Disk); Account account = CallContext.current().getCallingAccount(); Object name = cmd.getDiskOfferingName();
