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

Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user" 

This reverts commit 94254e3c2b.

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java

Regular user should be able to list the network offering with specifyVlan=true. He just can't use when create the network as he is unaware of the physical network topology. But as the admin can create the network on the user's behalf using this kind of offering, so the user should be able to see the offering's details
This commit is contained in:
Alena Prokharchyk 2013-08-14 15:10:28 -07:00
parent 950672ef8c
commit 707d6993bf
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -4508,9 +4508,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
// only root admin can list network offering with specifyVlan = true
if(caller.getType() != Account.ACCOUNT_TYPE_ADMIN){
specifyVlan = false;
}
if (specifyVlan != null) {
sc.addAnd("specifyVlan", SearchCriteria.Op.EQ, specifyVlan);
}