You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/07/11 00:34:07 UTC
git commit: updated refs/heads/master to 18b17fc
Updated Branches:
refs/heads/master ef7d2740b -> 18b17fc54
CLOUDSTACK-2988: UI > instances menu > Update Instance action - add Dynamically Scalable field.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/18b17fc5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18b17fc5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18b17fc5
Branch: refs/heads/master
Commit: 18b17fc54daeab2b94818f537a887ea17ae44695
Parents: ef7d274
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jul 10 15:31:25 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jul 10 15:33:58 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18b17fc5/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index f905fa4..7928c68 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -726,6 +726,7 @@
var data = {
id: args.context.instances[0].id,
group: args.data.group,
+ isdynamicallyscalable: (args.data.isdynamicallyscalable=="on"),
ostypeid: args.data.guestosid
};
@@ -1366,9 +1367,16 @@
});
return toClearInterval;
}
- },
- hypervisor: { label: 'label.hypervisor' },
+ },
templatename: { label: 'label.template' },
+
+ isdynamicallyscalable: {
+ label: 'Dynamically Scalable',
+ isBoolean: true,
+ isEditable: true,
+ converter:cloudStack.converters.toBooleanText
+ },
+
guestosid: {
label: 'label.os.type',
isEditable: true,
@@ -1388,7 +1396,9 @@
});
}
},
-
+
+ hypervisor: { label: 'label.hypervisor' },
+
/*
isoid: {
label: 'label.attached.iso',