From 9e4e3f46bb2a23242818eca58eb04c11e88d4e1d Mon Sep 17 00:00:00 2001 From: will Date: Mon, 28 Mar 2011 18:27:35 -0700 Subject: [PATCH] bug 9185: Fixed issues with having a "." in zonename when attempting to list templates and isos in the UI. --- ui/scripts/cloud.core.iso.js | 2 +- ui/scripts/cloud.core.template.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index 34e1f99fbd5..a4f4b509f6c 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -291,7 +291,7 @@ function initCreateVmFromIsoDialog() { } function isoGetMidmenuId(jsonObj) { - return "midmenuItem_" + jsonObj.id + "_" + fromdb(jsonObj.zonename).replace(/\s/g, ""); //remove all spaces in zonename + return "midmenuItem_" + jsonObj.id + "_z" + jsonObj.zoneid; //remove all spaces in zonename } function isoToMidmenu(jsonObj, $midmenuItem1) { diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index dd8b96ad461..ce9515b28f5 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -300,7 +300,7 @@ function afterLoadTemplateJSP() { } function templateGetMidmenuId(jsonObj) { - return "midmenuItem_" + jsonObj.id + "_" + fromdb(jsonObj.zonename).replace(/\s/g, ""); //remove all spaces in zonename + return "midmenuItem_" + jsonObj.id + "_z" +jsonObj.zoneid; } function templateToMidmenu(jsonObj, $midmenuItem1) {