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.

This commit is contained in:
will 2010-12-08 19:22:14 -08:00
parent 83d68999a2
commit 11e22726b7
2 changed files with 7 additions and 3 deletions

View File

@ -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)) {

View File

@ -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;
}