apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 11674: fixed listVolumes by zoneId for regularUsers/domainAdmins

Browse Source 
status 11674: resolved fixed
This commit is contained in:
Alena Prokharchyk 2011-11-22 13:54:28 -08:00
parent 60a70c1c13
commit 683b5635e3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1939,11 +1939,10 @@ public class ManagementServerImpl implements ManagementServer {
Object keyword = cmd.getKeyword();
Object type = cmd.getType();
Object zone = null;
Object zoneId = cmd.getZoneId();
Object pod = null;
// Object host = null; TODO
if (isAdmin) {
zone = cmd.getZoneId();
pod = cmd.getPodId();
// host = cmd.getHostId(); TODO
} else {
@ -2020,8 +2019,8 @@ public class ManagementServerImpl implements ManagementServer {
if (vmInstanceId != null) {
sc.setParameters("instanceId", vmInstanceId);
}
if (zone != null) {
sc.setParameters("dataCenterId", zone);
if (zoneId != null) {
sc.setParameters("dataCenterId", zoneId);
}
if (pod != null) {
sc.setParameters("podId", pod);