CLOUDSTACK-8093:Not able to list shared templates by passing id.

minchen07 · minchen07 · commit d304409c98c8 · 2014-12-18T10:00:18.000-08:00
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3123,8 +3123,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(Long temp
 
             // 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

Original file line number	Diff line number	Diff line change
`@@ -3123,8 +3123,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(Long temp`
`3123`	`3123`
`3124`	`3124`	`// if template is not public, perform permission check here`
`3125`	`3125`	`if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {`
`3126`		`- Account owner = _accountMgr.getAccount(template.getAccountId());`
`3127`		`- _accountMgr.checkAccess(caller, null, true, owner);`
	`3126`	`+ _accountMgr.checkAccess(caller, null, false, template);`
`3128`	`3127`	`}`
`3129`	`3128`
`3130`	`3129`	`// if templateId is specified, then we will just use the id to`