CLOUDSTACK-3245: non admin user not able to register template

Harikrishna Patnala · Alena Prokharchyk · commit c8692f2e4a97 · 2013-06-27T14:09:52.000-07:00
Reviewed-by: Alena Prokharchyk
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
@@ -212,7 +212,7 @@ public Boolean isDynamicallyScalable() {
     }
 
     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
@@ -227,13 +227,13 @@ public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocatio
         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);
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public Boolean isDynamicallyScalable() {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public Boolean isRoutingType() {`
`215`		`- return isRoutingType == null ? false : isRoutingType;`
	`215`	`+ return isRoutingType;`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`/////////////////////////////////////////////////////`