diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 2c6b6cbe32e..b58624530ef 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -363,7 +363,7 @@ public class ApiDBUtils { } public static VMTemplateVO findTemplateById(Long templateId) { - return _templateDao.findById(templateId); + return _templateDao.findByIdIncludingRemoved(templateId); } public static VMTemplateHostVO findTemplateHostRef(long templateId, long zoneId) { diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 8af2d42a09f..8f0129b4f0b 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -130,6 +130,7 @@ public class ApiResponseHelper { accountResponse.setAccountType(account.getType()); accountResponse.setDomainId(account.getDomainId()); accountResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); + accountResponse.setState(account.getState()); //get network stat List stats = ApiDBUtils.listUserStatsBy(account.getId());