From c8692f2e4a9760a58dbf457bf128fa484a491d0d Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Fri, 28 Jun 2013 00:11:54 +0530 Subject: [PATCH] CLOUDSTACK-3245: non admin user not able to register template Reviewed-by: Alena Prokharchyk --- .../api/command/user/template/RegisterTemplateCmd.java | 2 +- server/src/com/cloud/template/TemplateAdapterBase.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index 13bd5da7b72..c1d3f59f974 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -212,7 +212,7 @@ public class RegisterTemplateCmd extends BaseCmd { } public Boolean isRoutingType() { - return isRoutingType == null ? false : isRoutingType; + return isRoutingType; } ///////////////////////////////////////////////////// diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java index 7835680b9b8..c5d4a6b7d15 100755 --- a/server/src/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/com/cloud/template/TemplateAdapterBase.java @@ -227,13 +227,13 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId()); _accountMgr.checkAccess(caller, null, true, owner); - + boolean isRouting = (cmd.isRoutingType() == null) ? false : cmd.isRoutingType(); return prepare(false, UserContext.current().getCallerUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getBits(), cmd.isPasswordEnabled(), cmd.getRequiresHvm(), cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), cmd.getZoneId(), HypervisorType.getType(cmd.getHypervisor()), cmd.getChecksum(), true, cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), - cmd.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER); + isRouting ? TemplateType.ROUTING : TemplateType.USER); }