cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned.
Date Mon, 04 Mar 2013 22:02:07 GMT
Updated Branches:
  refs/heads/4.1 99284e7c9 -> 02bbb1082


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/02bbb108
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/02bbb108
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/02bbb108

Branch: refs/heads/4.1
Commit: 02bbb10826a22cb3f1bcebfdc1c98b174b1371c0
Parents: 99284e7
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Mar 4 13:43:49 2013 -0800
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Mon Mar 4 16:55:31 2013 -0500

----------------------------------------------------------------------
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/02bbb108/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();
 
 


Mime
View raw message