Skip to content

Commit 489b60e

Browse files
author
Jessica Wang
committed
CS-16573: cloudstack UI - system offering page, disk offering page - encode data passed to API call.
1 parent ab4f707 commit 489b60e

1 file changed

Lines changed: 115 additions & 91 deletions

File tree

‎ui/scripts/configuration.js‎

Lines changed: 115 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -528,35 +528,52 @@
528528
},
529529

530530
action: function(args) {
531-
var array1 = [];
532-
array1.push("&name=" + args.data.name);
533-
array1.push("&displaytext=" + todb(args.data.description));
534-
array1.push("&systemvmtype=" + todb(args.data.systemvmtype));
535-
array1.push("&storageType=" + todb(args.data.storageType));
536-
array1.push("&cpuNumber=" + args.data.cpuNumber);
537-
array1.push("&cpuSpeed="+ args.data.cpuSpeed);
538-
array1.push("&memory=" + args.data.memory);
539-
540-
if(args.data.networkRate != null && args.data.networkRate.length > 0)
541-
array1.push("&networkrate=" + args.data.networkRate);
542-
543-
array1.push("&offerha=" + (args.data.offerHA == "on"));
531+
var data = {
532+
issystem: true,
533+
name: args.data.name,
534+
displaytext: args.data.description,
535+
systemvmtype: args.data.systemvmtype,
536+
storageType: args.data.storageType,
537+
cpuNumber: args.data.cpuNumber,
538+
cpuSpeed: args.data.cpuSpeed,
539+
memory: args.data.memory
540+
};
544541

545-
if(args.data.storageTags != null && args.data.storageTags.length > 0)
546-
array1.push("&tags=" + todb(args.data.storageTags));
542+
if(args.data.networkRate != null && args.data.networkRate.length > 0) {
543+
$.extend(data, {
544+
networkrate: args.data.networkRate
545+
});
546+
}
547547

548-
if(args.data.hostTags != null && args.data.hostTags.length > 0)
549-
array1.push("&hosttags=" + todb(args.data.hostTags));
548+
$.extend(data, {
549+
offerha: (args.data.offerHA == "on")
550+
});
551+
552+
if(args.data.storageTags != null && args.data.storageTags.length > 0) {
553+
$.extend(data, {
554+
tags: args.data.storageTags
555+
});
556+
}
550557

551-
array1.push("&limitcpuuse=" + (args.data.cpuCap == "on"));
558+
if(args.data.hostTags != null && args.data.hostTags.length > 0) {
559+
$.extend(data, {
560+
hosttags: args.data.hostTags
561+
});
562+
}
552563

553-
if(args.$form.find('.form-item[rel=domainId]').css("display") != "none")
554-
array1.push("&domainid=" + args.data.domainId);
564+
$.extend(data, {
565+
limitcpuuse: (args.data.cpuCap == "on")
566+
});
567+
568+
if(args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
569+
$.extend(data, {
570+
domainid: args.data.domainId
571+
});
572+
}
555573

556574
$.ajax({
557-
url: createURL("createServiceOffering&issystem=true"+array1.join("")),
558-
dataType: "json",
559-
async: true,
575+
url: createURL('createServiceOffering'),
576+
data: data,
560577
success: function(json) {
561578
var item = json.createserviceofferingresponse.serviceoffering;
562579
args.response.success({data: item});
@@ -576,22 +593,16 @@
576593
},
577594

578595
dataProvider: function(args) {
579-
var array1 = [];
580-
if(args.filterBy != null) {
581-
if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
582-
switch(args.filterBy.search.by) {
583-
case "name":
584-
if(args.filterBy.search.value.length > 0)
585-
array1.push("&keyword=" + args.filterBy.search.value);
586-
break;
587-
}
588-
}
589-
}
590-
596+
var data = {};
597+
listViewDataProvider(args, data);
598+
599+
$.extend(data, {
600+
issystem: true
601+
});
602+
591603
$.ajax({
592-
url: createURL("listServiceOfferings&issystem=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
593-
dataType: "json",
594-
async: true,
604+
url: createURL('listServiceOfferings'),
605+
data: data,
595606
success: function(json) {
596607
var items = json.listserviceofferingsresponse.serviceoffering;
597608
args.response.success({data:items});
@@ -608,12 +619,14 @@
608619
edit: {
609620
label: 'label.edit',
610621
action: function(args) {
611-
var array1 = [];
612-
array1.push("&name=" + todb(args.data.name));
613-
array1.push("&displaytext=" + todb(args.data.displaytext));
622+
var data = {
623+
id: args.context.systemServiceOfferings[0].id,
624+
name: args.data.name,
625+
displaytext: args.data.displaytext
626+
};
614627
$.ajax({
615-
url: createURL("updateServiceOffering&id=" + args.context.systemServiceOfferings[0].id + array1.join("")),
616-
dataType: "json",
628+
url: createURL('updateServiceOffering'),
629+
data: data,
617630
success: function(json) {
618631
var item = json.updateserviceofferingresponse.serviceoffering;
619632
args.response.success({data: item});
@@ -636,10 +649,12 @@
636649
}
637650
},
638651
action: function(args) {
652+
var data = {
653+
id: args.context.systemServiceOfferings[0].id
654+
};
639655
$.ajax({
640-
url: createURL("deleteServiceOffering&id=" + args.context.systemServiceOfferings[0].id),
641-
dataType: "json",
642-
async: true,
656+
url: createURL('deleteServiceOffering'),
657+
data: data,
643658
success: function(json) {
644659
args.response.success();
645660
},
@@ -723,11 +738,14 @@
723738
}
724739
],
725740

726-
dataProvider: function(args) {
741+
dataProvider: function(args) {
742+
var data = {
743+
issystem: true,
744+
id: args.context.systemServiceOfferings[0].id
745+
};
727746
$.ajax({
728-
url: createURL("listServiceOfferings&issystem=true&id=" + args.context.systemServiceOfferings[0].id),
729-
dataType: "json",
730-
async: true,
747+
url: createURL('listServiceOfferings'),
748+
data: data,
731749
success: function(json) {
732750
var item = json.listserviceofferingsresponse.serviceoffering[0];
733751
args.response.success({
@@ -770,22 +788,12 @@
770788
reorder: cloudStack.api.actions.sort('updateDiskOffering', 'diskOfferings'),
771789

772790
dataProvider: function(args) {
773-
var array1 = [];
774-
if(args.filterBy != null) {
775-
if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
776-
switch(args.filterBy.search.by) {
777-
case "name":
778-
if(args.filterBy.search.value.length > 0)
779-
array1.push("&keyword=" + args.filterBy.search.value);
780-
break;
781-
}
782-
}
783-
}
784-
791+
var data = {};
792+
listViewDataProvider(args, data);
793+
785794
$.ajax({
786-
url: createURL("listDiskOfferings&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
787-
dataType: "json",
788-
async: true,
795+
url: createURL('listDiskOfferings'),
796+
data: data,
789797
success: function(json) {
790798
var items = json.listdiskofferingsresponse.diskoffering;
791799
args.response.success({data:items});
@@ -880,25 +888,35 @@
880888
},
881889

882890
action: function(args) {
883-
var array1 = [];
884-
array1.push("&name=" + args.data.name);
885-
array1.push("&displaytext=" + todb(args.data.description));
886-
887-
array1.push("&storageType=" + todb(args.data.storageType));
888-
array1.push("&customized=" + (args.data.isCustomized=="on"));
889-
if(args.$form.find('.form-item[rel=disksize]').css("display") != "none")
890-
array1.push("&disksize=" + args.data.disksize);
891+
var data = {
892+
isMirrored: false,
893+
name: args.data.name,
894+
displaytext: args.data.description,
895+
storageType: args.data.storageType,
896+
customized: (args.data.isCustomized=="on")
897+
};
898+
899+
if(args.$form.find('.form-item[rel=disksize]').css("display") != "none") {
900+
$.extend(data, {
901+
disksize: args.data.disksize
902+
});
903+
}
891904

892-
if(args.data.tags != null && args.data.tags.length > 0)
893-
array1.push("&tags=" + todb(args.data.tags));
905+
if(args.data.tags != null && args.data.tags.length > 0) {
906+
$.extend(data, {
907+
tags: args.data.tags
908+
});
909+
}
894910

895-
if(args.$form.find('.form-item[rel=domainId]').css("display") != "none")
896-
array1.push("&domainid=" + args.data.domainId);
911+
if(args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
912+
$.extend(data, {
913+
domainid: args.data.domainId
914+
});
915+
}
897916

898917
$.ajax({
899-
url: createURL("createDiskOffering&isMirrored=false" + array1.join("")),
900-
dataType: "json",
901-
async: true,
918+
url: createURL('createDiskOffering'),
919+
data: data,
902920
success: function(json) {
903921
var item = json.creatediskofferingresponse.diskoffering;
904922
args.response.success({data: item});
@@ -923,12 +941,14 @@
923941
edit: {
924942
label: 'label.edit',
925943
action: function(args) {
926-
var array1 = [];
927-
array1.push("&name=" + todb(args.data.name));
928-
array1.push("&displaytext=" + todb(args.data.displaytext));
944+
var data = {
945+
id: args.context.diskOfferings[0].id,
946+
name: args.data.name,
947+
displaytext: args.data.displaytext
948+
};
929949
$.ajax({
930-
url: createURL("updateDiskOffering&id=" + args.context.diskOfferings[0].id + array1.join("")),
931-
dataType: "json",
950+
url: createURL('updateDiskOffering'),
951+
data: data,
932952
success: function(json) {
933953
var item = json.updatediskofferingresponse.diskoffering;
934954
args.response.success({data: item});
@@ -951,10 +971,12 @@
951971
}
952972
},
953973
action: function(args) {
974+
var data = {
975+
id: args.context.diskOfferings[0].id
976+
};
954977
$.ajax({
955-
url: createURL("deleteDiskOffering&id=" + args.context.diskOfferings[0].id),
956-
dataType: "json",
957-
async: true,
978+
url: createURL('deleteDiskOffering'),
979+
data: data,
958980
success: function(json) {
959981
args.response.success();
960982
},
@@ -1010,10 +1032,12 @@
10101032
],
10111033

10121034
dataProvider: function(args) {
1035+
var data = {
1036+
id: args.context.diskOfferings[0].id
1037+
};
10131038
$.ajax({
1014-
url: createURL("listDiskOfferings&id=" + args.context.diskOfferings[0].id),
1015-
dataType: "json",
1016-
async: true,
1039+
url: createURL('listDiskOfferings'),
1040+
data: data,
10171041
success: function(json) {
10181042
var item = json.listdiskofferingsresponse.diskoffering[0];
10191043
args.response.success({

0 commit comments

Comments
 (0)