From 75fa8493244d761eb83ce36384b0b7cffdc66d53 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Thu, 20 Jan 2011 17:28:12 +0530
Subject: [PATCH] bug 7418,7706 : listisos - removing domainid = -1 for system
 isos. Adding the created attr. status 7418,7706 : resolved fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index e3db40ed3a4..4c65555ffa4 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1848,7 +1848,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
         List<TemplateResponse> isoResponses = new ArrayList<TemplateResponse>();
         
-        for (Pair<Long,Long> isoZonePair : isoZonePairSet) {
+        for (Pair<Long,Long> isoZonePair : isoZonePairSet) {  
         	VMTemplateVO iso = ApiDBUtils.findTemplateById(isoZonePair.first());
             if ( (isBootable == null || !isBootable) && iso.getTemplateType() == TemplateType.PERHOST ) {
                 TemplateResponse isoResponse = new TemplateResponse();
@@ -1862,8 +1862,14 @@ public class ApiResponseHelper implements ResponseGenerator {
                 isoResponse.setFeatured(iso.isFeatured());
                 isoResponse.setCrossZones(iso.isCrossZones());
                 isoResponse.setPublic(iso.isPublicTemplate());
+                isoResponse.setCreated(iso.getCreated());
                 isoResponse.setPasswordEnabled(false);
-                isoResponse.setDomainId(iso.getDomainId());
+                Account owner = ApiDBUtils.findAccountById(iso.getAccountId());
+                if (owner != null) {
+                    isoResponse.setAccount(owner.getAccountName());
+                    isoResponse.setDomainId(owner.getDomainId());                 
+                    isoResponse.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName());
+                }
                 isoResponse.setObjectName("iso");
                 isoResponses.add(isoResponse);
                 response.setResponses(isoResponses);