CLOUDSTACK-9594: reverted changes introduced in CLOUDSTACK-9376
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7059f9e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7059f9e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7059f9e1 Branch: refs/heads/master Commit: 7059f9e12d4320d1a5b768e8ce586430e5785a8e Parents: a132312 Author: Sudhansu <sudhansu.s...@accelerite.com> Authored: Tue Dec 6 23:17:37 2016 +0530 Committer: Sudhansu <sudhansu.s...@accelerite.com> Committed: Tue Dec 6 23:17:37 2016 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7059f9e1/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index a0e12e6..17c5855 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3054,9 +3054,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService, Confi boolean listAll = false; if (templateFilter != null && templateFilter == TemplateFilter.all) { - if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { + if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) { throw new InvalidParameterValueException("Filter " + TemplateFilter.all - + " can be specified by root admin only"); + + " can be specified by admin only"); } listAll = true; }
