Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5BF7D10B1F for ; Thu, 18 Dec 2014 18:26:05 +0000 (UTC) Received: (qmail 70065 invoked by uid 500); 18 Dec 2014 18:26:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70031 invoked by uid 500); 18 Dec 2014 18:26:05 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70022 invoked by uid 99); 18 Dec 2014 18:26:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 18:26:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D8501957923; Thu, 18 Dec 2014 18:26:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Message-Id: <5f6e6edfac244da1a6fa6e6c68993dab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to d304409 Date: Thu, 18 Dec 2014 18:26:04 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 68b9ba451 -> d304409c9 CLOUDSTACK-8093:Not able to list shared templates by passing id. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d304409c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d304409c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d304409c Branch: refs/heads/master Commit: d304409c98c87e9fb8a4e712cd7f9110c91bd1fa Parents: 68b9ba4 Author: Min Chen Authored: Wed Dec 17 22:33:24 2014 -0800 Committer: Min Chen Committed: Thu Dec 18 10:00:18 2014 -0800 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d304409c/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 634b065..a90be50 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3123,8 +3123,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { // if template is not public, perform permission check here if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { - Account owner = _accountMgr.getAccount(template.getAccountId()); - _accountMgr.checkAccess(caller, null, true, owner); + _accountMgr.checkAccess(caller, null, false, template); } // if templateId is specified, then we will just use the id to