Updated Branches: refs/heads/4.2 5c18483d8 -> 798c507c7
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/798c507c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/798c507c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/798c507c Branch: refs/heads/4.2 Commit: 798c507c7d9a0241fbaaddb3348eaa3313b4f9a3 Parents: 5c18483 Author: Harikrishna Patnala <[email protected]> Authored: Wed Jul 31 16:56:08 2013 +0530 Committer: Nitin Mehta <[email protected]> Committed: Wed Jul 31 16:56:59 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/798c507c/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 26efa10..a181553 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3204,7 +3204,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()));
