API: Fix listing Userdata by keyword or name

Pearl1594 · Pearl1594 · commit 5355d562079d · 2024-09-30T13:44:54.000-04:00
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -4722,7 +4722,7 @@ public Pair<List<? extends UserData>, Integer> listUserDatas(final ListUserDataC
 
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
-        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
+        sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
         final SearchCriteria<UserDataVO> sc = sb.create();
         _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
@@ -4735,7 +4735,7 @@ public Pair<List<? extends UserData>, Integer> listUserDatas(final ListUserDataC
         }
 
         if (keyword != null) {
-            sc.setParameters("name",  "%" + keyword + "%");
+            sc.setParameters("keyword",  "%" + keyword + "%");
         }
 
         final Pair<List<UserDataVO>, Integer> result = userDataDao.searchAndCount(sc, searchFilter);

Original file line number	Diff line number	Diff line change
`@@ -4722,7 +4722,7 @@ public Pair<List<? extends UserData>, Integer> listUserDatas(final ListUserDataC`
`4722`	`4722`
`4723`	`4723`	`sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);`
`4724`	`4724`	`sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);`
`4725`		`- sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);`
	`4725`	`+ sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);`
`4726`	`4726`	`final SearchCriteria<UserDataVO> sc = sb.create();`
`4727`	`4727`	`_accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);`
`4728`	`4728`
`@@ -4735,7 +4735,7 @@ public Pair<List<? extends UserData>, Integer> listUserDatas(final ListUserDataC`
`4735`	`4735`	`}`
`4736`	`4736`
`4737`	`4737`	`if (keyword != null) {`
`4738`		`- sc.setParameters("name", "%" + keyword + "%");`
	`4738`	`+ sc.setParameters("keyword", "%" + keyword + "%");`
`4739`	`4739`	`}`
`4740`	`4740`
`4741`	`4741`	`final Pair<List<UserDataVO>, Integer> result = userDataDao.searchAndCount(sc, searchFilter);`