From 3b9c9815c8eaea7723678ba137746b84351c8bb3 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 31 May 2011 12:04:08 -0700 Subject: [PATCH] bug 7553: listServiceOfferings API has a new parameter "issystem" now. Change UI to call "listServiceOfferings&issystem=false" for listing non-system service offerings. --- ui/scripts/cloud.core.init.js | 4 ++-- ui/scripts/cloud.core.instance.js | 2 +- ui/scripts/cloud.core.iso.js | 2 +- ui/scripts/cloud.core.template.js | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index f6c7b9f768a..4d65e2b8614 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -235,9 +235,9 @@ $(document).ready(function() { bindAndListMidMenuItems($("#leftmenu_submenu_systemvm"), "listSystemVms", systemVmGetSearchParams, "listsystemvmsresponse", "systemvm", "jsp/systemvm.jsp", afterLoadSystemVmJSP, systemvmToMidmenu, systemvmToRightPanel, getMidmenuId, false); //configuration - bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", serviceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings&issystem=false", serviceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", diskOfferingGetSearchParams, "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_network_offering"), "listNetworkOfferings&&guestiptype=Virtual", networkOfferingGetSearchParams, "listnetworkofferingsresponse", "networkoffering", "jsp/networkoffering.jsp", afterLoadNetworkOfferingJSP, networkOfferingToMidmenu, networkOfferingToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_network_offering"), "listNetworkOfferings&guestiptype=Virtual", networkOfferingGetSearchParams, "listnetworkofferingsresponse", "networkoffering", "jsp/networkoffering.jsp", afterLoadNetworkOfferingJSP, networkOfferingToMidmenu, networkOfferingToRightPanel, getMidmenuId, false); } $("#leftmenu_global_setting").bind("click", function(event) { diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 80080608d59..2a2589a907e 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -399,7 +399,7 @@ function initVMWizard() { }); $.ajax({ - data: createURL("command=listServiceOfferings"), + data: createURL("command=listServiceOfferings&issystem=false"), dataType: "json", async: false, success: function(json) { diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index d7038ec50a2..12d8a5fe352 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -249,7 +249,7 @@ function initCreateVmFromIsoDialog() { var $dialogCreateVmFromIso = $("#dialog_create_vm_from_iso"); $.ajax({ - data: createURL("command=listServiceOfferings"), + data: createURL("command=listServiceOfferings&issystem=false"), dataType: "json", success: function(json) { var items = json.listserviceofferingsresponse.serviceoffering; diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index f93146daf58..943cfe08770 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -148,7 +148,7 @@ function afterLoadTemplateJSP() { var $midmenuItem1 = beforeAddingMidMenuItem() ; $.ajax({ - data: createURL("command=registerTemplate&name="+todb(name)+"&displayText="+todb(desc)+"&url="+todb(url)+"&zoneid="+zoneId+"&ispublic="+isPublic+moreCriteria.join("")+"&format="+format+"&passwordEnabled="+password+"&osTypeId="+osType+"&hypervisor="+hypervisor+"&response=json"), + data: createURL("command=registerTemplate&name="+todb(name)+"&displayText="+todb(desc)+"&url="+todb(url)+"&zoneid="+zoneId+"&ispublic="+isPublic+moreCriteria.join("")+"&format="+format+"&passwordEnabled="+password+"&osTypeId="+osType+"&hypervisor="+hypervisor+""), dataType: "json", success: function(json) { var items = json.registertemplateresponse.template; @@ -233,7 +233,7 @@ function afterLoadTemplateJSP() { //zone dropdown (end) $.ajax({ - data: createURL("command=listOsTypes&response=json"), + data: createURL("command=listOsTypes"), dataType: "json", async: false, success: function(json) { @@ -253,7 +253,7 @@ function afterLoadTemplateJSP() { }); $.ajax({ - data: createURL("command=listServiceOfferings&response=json"), + data: createURL("command=listServiceOfferings&issystem=false"), dataType: "json", success: function(json) { var items = json.listserviceofferingsresponse.serviceoffering; @@ -266,7 +266,7 @@ function afterLoadTemplateJSP() { }); $.ajax({ - data: createURL("command=listDiskOfferings&response=json"), + data: createURL("command=listDiskOfferings"), dataType: "json", success: function(json) { var items = json.listdiskofferingsresponse.diskoffering;