From 09fa6e5d8341311a5207501574f4b653f9fac7ea Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 20 Jan 2014 16:29:37 -0800 Subject: [PATCH] CLOUDSTACK-5889: UI > Instances > (1) change service offering action: corresonding UI change for new change of scaleVirtualMachine API (that customparameter parameter has been renamed). (2) detailView: add # of CPU Cores, CPU (in MHz), Memory (in MB). --- ui/scripts/instances.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 05c5f79474b..9430fe4b9bb 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1525,17 +1525,17 @@ if (args.$form.find('.form-item[rel=cpuSpeed]').is(':visible')) { $.extend(data, { - 'customparameters[0].cpuSpeed': args.data.cpuSpeed + 'details[0].cpuSpeed': args.data.cpuSpeed }); } if (args.$form.find('.form-item[rel=cpuNumber]').is(':visible')) { $.extend(data, { - 'customparameters[0].cpuNumber': args.data.cpuNumber + 'details[0].cpuNumber': args.data.cpuNumber }); } if (args.$form.find('.form-item[rel=memory]').is(':visible')) { $.extend(data, { - 'customparameters[0].memory': args.data.memory + 'details[0].memory': args.data.memory }); } @@ -1789,6 +1789,16 @@ serviceofferingname: { label: 'label.compute.offering' }, + cpunumber: { + label: 'label.num.cpu.cores' + }, + cpuspeed: { + label: 'label.cpu.mhz' + }, + memory: { + label: 'label.memory.mb' + }, + haenable: { label: 'label.ha.enabled', converter: cloudStack.converters.toBooleanText