Updated Branches: refs/heads/master c7a1dbb17 -> 3d9fc3dbc
CLOUDSTACK-2717: listCapabilities API to return allow.public.user.templates configuration parameter value defined at account level. Signed by - Nitin Mehta<[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d9fc3db Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d9fc3db Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d9fc3db Branch: refs/heads/master Commit: 3d9fc3dbc0e5c19635392593caa61776da02b2b6 Parents: c7a1dbb Author: Harikrishna Patnala <[email protected]> Authored: Wed Jul 31 16:56:08 2013 +0530 Committer: Nitin Mehta <[email protected]> Committed: Wed Jul 31 16:58:32 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d9fc3db/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index dbb2f2a..4d1abb8 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3221,7 +3221,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe long diskOffMaxSize = Long.valueOf(_configDao.getValue(Config.CustomDiskOfferingMaxSize.key())); - String userPublicTemplateEnabled = _configs.get(Config.AllowPublicUserTemplates.key()); + String userPublicTemplateEnabled = _configServer.getConfigValue(Config.AllowPublicUserTemplates.key(), Config.ConfigurationParameterScope.account.toString(), caller.getId()); // add some parameters UI needs to handle API throttling boolean apiLimitEnabled = Boolean.parseBoolean(_configDao.getValue(Config.ApiLimitEnabled.key()));
