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

Merge remote-tracking branch 'origin/4.13'

This commit is contained in:
Rohit Yadav 2020-02-28 15:06:24 +05:30
parent 3ca5be40d4 79f7f0f007
commit ba8fb61a33
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/cloud/server/ManagementServerImpl.java
View File

@ -3762,8 +3762,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
if (keyword != null) {
sc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
final SearchCriteria<SSHKeyPairVO> ssc = _sshKeyPairDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("name", SearchCriteria.Op.SC, ssc);
}
final Pair<List<SSHKeyPairVO>, Integer> result = _sshKeyPairDao.searchAndCount(sc, searchFilter);