You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/01/22 20:27:49 UTC
[24/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab
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).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09fa6e5d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09fa6e5d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09fa6e5d
Branch: refs/heads/rbac
Commit: 09fa6e5d8341311a5207501574f4b653f9fac7ea
Parents: 3689f72
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Jan 20 16:29:37 2014 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Jan 20 16:35:02 2014 -0800
----------------------------------------------------------------------
ui/scripts/instances.js | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09fa6e5d/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 05c5f79..9430fe4 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