From db981484abc68578025555d2bb62fd03d19244e2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 25 Jan 2011 10:39:02 -0800
Subject: [PATCH] community template shows for (1) root-admin role (2)
 domain-admin role + getUserPublicTemplateEnabled() == "true".

---
 ui/scripts/cloud.core.instance.js | 8 ++++++++
 ui/scripts/cloud.core.js          | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 587e4b90ac2..318fbce06ad 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -376,6 +376,14 @@ var vmPopupTemplatePageSize = 6; //max number of templates in VM wizard
 var currentStepInVmPopup = 1;
 function initVMWizard() {
     $vmPopup = $("#vm_popup");  
+    
+    if (isAdmin() || (isDomainAdmin() && getUserPublicTemplateEnabled() == "true")) {
+        $vmPopup.find("#wiz_community").show();   
+    } 
+    else {
+        $vmPopup.find("#wiz_community").hide();   
+    } 
+    
     $("#add_vm_button").unbind("click").bind("click", function(event) {
         vmWizardOpen();			
 	    $.ajax({
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index eed624477e2..99a4c4018ed 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1158,7 +1158,7 @@ function showLeftNavigationBasedOnRole() {
 	    $("#leftmenu_security_group_container").hide();
 	}
 	
-	if (getUserPublicTemplateEnabled() == "true") {
+	if (isAdmin() || (isDomainAdmin() && getUserPublicTemplateEnabled() == "true")) {
 	    $("#leftmenu_submenu_community_template_container, #leftmenu_submenu_community_iso_container").show();
 	}
 	else {
@@ -1252,7 +1252,7 @@ var g_timezone = null;
 var g_directAttachSecurityGroupsEnabled = "false";
 function getDirectAttachSecurityGroupsEnabled() { return g_directAttachSecurityGroupsEnabled; }
 
-g_userPublicTemplateEnabled = "true"
+var g_userPublicTemplateEnabled = "true"
 function getUserPublicTemplateEnabled() { return g_userPublicTemplateEnabled; }
 
 //keyboard keycode