From 11e22726b7c4c7c28a1e14343d499d16bff866e1 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Wed, 8 Dec 2010 19:22:14 -0800
Subject: [PATCH] bug 7438: Commenting out feature where you can directly
 create a VM from a template or ISO for Beta2.  It just doesn't work with the
 new networking model.

---
 ui/scripts/cloud.core.iso.js      | 7 +++++--
 ui/scripts/cloud.core.template.js | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 70b1a77e59a..0faef0b35df 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -309,13 +309,16 @@ function isoJsonToDetailsTab() {
             buildActionLinkForTab("Copy ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	        
     }
 		
-	// "Create VM" 
+	// "Create VM" 
+	// Commenting this out for Beta2 as it does not support the new network.
+	/*
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == false) || (jsonObj.bootable == false)) {
 	}
     else {        
         buildActionLinkForTab("Create VM", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
         noAvailableActions = false;
-    }
+    }
+	*/
     
 	// "Delete" 
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false && jsonObj.isostatus != null && jsonObj.isostatus.indexOf("% Downloaded") != -1)) {
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 2783dde7256..94a1e205927 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -329,7 +329,8 @@ function templateJsonToDetailsTab() {
         buildActionLinkForTab("Edit Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);      
         //$("#edit_button").show();
         buildActionLinkForTab("Copy Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);			
-        buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);	        
+        // For Beta2, this simply doesn't work without a network.
+		//buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);	        
         buildActionLinkForTab("Download Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
         noAvailableActions = false;		
     }