etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7553: listServiceOfferings API has a new parameter "issystem" now. Change UI to call "listServiceOfferings&issystem=false" for listing non-system service offerings.

This commit is contained in:
Jessica Wang 2011-05-31 12:04:08 -07:00
parent 8754f8fab8
commit 3b9c9815c8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/cloud.core.init.js
View File

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

2
ui/scripts/cloud.core.instance.js
View File

@ -399,7 +399,7 @@ function initVMWizard() {
});
$.ajax({
data: createURL("command=listServiceOfferings"),
data: createURL("command=listServiceOfferings&issystem=false"),
dataType: "json",
async: false,
success: function(json) {

2
ui/scripts/cloud.core.iso.js
View File

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

8
ui/scripts/cloud.core.template.js
View File

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