CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/48aa035a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/48aa035a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/48aa035a Branch: refs/heads/vim51_win8 Commit: 48aa035a71aab534f6c736017c6faed8cedcd23e Parents: 8ae8001 Author: Min Chen <[email protected]> Authored: Mon Mar 4 13:43:49 2013 -0800 Committer: Min Chen <[email protected]> Committed: Mon Mar 4 14:42:32 2013 -0800 ---------------------------------------------------------------------- .../api/query/dao/UserAccountJoinDaoImpl.java | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/48aa035a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java index 1bb3981..7072324 100644 --- a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java @@ -22,22 +22,17 @@ import javax.ejb.Local; import org.apache.log4j.Logger; -import com.cloud.api.ApiDBUtils; -import com.cloud.api.ApiResponseHelper; -import com.cloud.api.query.vo.InstanceGroupJoinVO; + import com.cloud.api.query.vo.UserAccountJoinVO; -import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.UserResponse; import org.springframework.stereotype.Component; -import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.vm.InstanceGroup; @Component @@ -58,7 +53,7 @@ public class UserAccountJoinDaoImpl extends GenericDaoBase<UserAccountJoinVO, Lo vrIdSearch.done(); vrAcctIdSearch = createSearchBuilder(); - vrAcctIdSearch.and("accountid", vrAcctIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); + vrAcctIdSearch.and("accountId", vrAcctIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); vrAcctIdSearch.done();
