gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-28 00:29:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

CLOUDSTACK-5960: Domain admin or user cannot register a template using

Browse Source 
S3/Swift object store.
This commit is contained in:
Min Chen 2014-01-27 11:54:38 -08:00
parent 3fae917ebe
commit 6d1475182c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/template/TemplateAdapterBase.java
View File

@ -162,8 +162,14 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
}
boolean isAdmin = _accountDao.findById(templateOwner.getId()).getType() == Account.ACCOUNT_TYPE_ADMIN;
if (!isAdmin && zoneId == null) {
boolean isRegionStore = false;
List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
if (stores != null && stores.size() > 0) {
isRegionStore = true;
}
if (!isAdmin && zoneId == null && !isRegionStore ) {
// domain admin and user should also be able to register template on a region store
throw new InvalidParameterValueException("Please specify a valid zone Id.");
}