From 13ceb54bba8afc5c8fcf0f6cde2403eada42b819 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Fri, 18 Feb 2011 12:03:16 -0800
Subject: [PATCH] bug 8653: filtering system vols from user's view status 8653:
 resolved fixed

---
 .../src/com/cloud/server/ManagementServerImpl.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 397cc0c0b09..5d620610230 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2346,12 +2346,9 @@ public class ManagementServerImpl implements ManagementServer {
         // Only return volumes that are not destroyed
         sb.and("state", sb.entity().getState(), SearchCriteria.Op.NEQ);
         
-        //Allow null ids
-//        sb.or("nullid", sb.entity().getTemplateId(), SearchCriteria.Op.NULL);
-//        
-//        SearchBuilder<VMTemplateVO> templateSearch = _templateDao.createSearchBuilder();
-//        templateSearch.and("templateType", templateSearch.entity().getTemplateType(), SearchCriteria.Op.NEQ);
-//        sb.join("templateSearch", templateSearch, sb.entity().getTemplateId(), templateSearch.entity().getId(), JoinBuilder.JoinType.LEFTOUTER);
+        SearchBuilder<DiskOfferingVO> diskOfferingSearch = _diskOfferingDao.createSearchBuilder();
+        diskOfferingSearch.and("systemUse", diskOfferingSearch.entity().isSystemUse(), SearchCriteria.Op.NEQ);
+        sb.join("diskOfferingSearch", diskOfferingSearch, sb.entity().getDiskOfferingId(), diskOfferingSearch.entity().getId(), JoinBuilder.JoinType.LEFTOUTER);
 
         if (((accountId == null) && (domainId != null) && isRecursive)) {
             // if accountId isn't specified, we can do a domain match for the admin case if isRecursive is true
@@ -2374,8 +2371,6 @@ public class ManagementServerImpl implements ManagementServer {
             sc.addAnd("name", SearchCriteria.Op.SC, ssc);
         }
         
-//        sc.setJoinParameters("templateSearch", "templateType", Storage.TemplateType.SYSTEM);
-        
         if (name != null) {
             sc.setParameters("name", "%" + name + "%");
         }
@@ -2386,6 +2381,7 @@ public class ManagementServerImpl implements ManagementServer {
 
         if (accountId != null) {
             sc.setParameters("accountIdEQ", accountId);
+            sc.setJoinParameters("diskOfferingSearch", "systemUse", 1);
         } else if (domainId != null) {
             DomainVO domain = _domainDao.findById(domainId);
             if(isRecursive) {