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

fixed listNetworks by projectId

This commit is contained in:
Alena Prokharchyk 2011-12-01 14:22:41 -08:00
parent 7f672097f9
commit 9f49967365
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -1811,7 +1811,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new InvalidParameterValueException("Parameter subDomainAccess can be specified only with aclType=Domain");
}
Account owner = null;
if (cmd.getAccountName() != null && domainId != null) {
if ((cmd.getAccountName() != null && domainId != null) || cmd.getProjectId() != null) {
owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), domainId, cmd.getProjectId());
} else {
owner = caller;

1
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -1280,7 +1280,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
return getAccount(project.getProjectAccountId());
}
if (isAdmin(caller.getType()) && accountName != null && domainId != null) {
Domain domain = _domainMgr.getDomain(domainId);