etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6895: fixed search by id in listDomains command 

status 6895: resolved fixed
This commit is contained in:
alena 2010-11-05 17:42:16 -07:00
parent 05ab3bf673
commit b1defdb71d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/domain/dao/DomainDao.java
View File

@ -18,8 +18,6 @@
package com.cloud.domain.dao;
import java.util.List;
import com.cloud.domain.DomainVO;
import com.cloud.utils.db.GenericDao;

8
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -4105,6 +4105,7 @@ public class ManagementServerImpl implements ManagementServer {
Object keyword = cmd.getKeyword();
SearchBuilder<DomainVO> sb = _domainDao.createSearchBuilder();
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);
sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);
@ -4126,11 +4127,8 @@ public class ManagementServerImpl implements ManagementServer {
sc.setParameters("level", level);
}
if ((domainName == null) && (level == null) && (domainId != null)) {
DomainVO domain = _domainDao.findById(domainId);
if (domain != null) {
sc.setParameters("path", domain.getPath() + "%");
}
if (domainId != null) {
sc.setParameters("id", domainId);
}
return _domainDao.search(sc, searchFilter);