cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to ae617b6
Date Wed, 14 Aug 2013 22:34:09 GMT
Updated Branches:
  refs/heads/master dd6b24522 -> ae617b6a3


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

This reverts commit 94254e3c2bd38573adac22d0c66817db3cfa1873.

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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae617b6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae617b6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae617b6a

Branch: refs/heads/master
Commit: ae617b6a351f0f160276c105d5a8222639620e7d
Parents: dd6b245
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Aug 14 15:10:28 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Aug 14 15:22:36 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae617b6a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 3d640b3..62699d6 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4414,9 +4414,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);
         }


Mime
View raw message