Updated Branches: refs/heads/4.3 9e92206e6 -> c9108376b
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/c9108376 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9108376 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9108376 Branch: refs/heads/4.3 Commit: c9108376b15dfa3fcf04375edea7d86d0056a985 Parents: 9e92206 Author: Bharat Kumar <bharat.ku...@citrix.com> Authored: Tue Nov 12 14:09:22 2013 +0530 Committer: Kishan Kavala <kis...@cloud.com> Committed: Tue Nov 12 15:25:47 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/c9108376/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();
