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/04/26 01:06:39 UTC
git commit: updated refs/heads/master to 64635ab
Updated Branches:
refs/heads/master 6f60833f9 -> 64635abba
CLOUDSTACK-1910: UI- Regions menu - GSLB - View assigned load balancing - refresh data.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64635abb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64635abb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64635abb
Branch: refs/heads/master
Commit: 64635abba5804767764e5d130ae6429c6b76b371
Parents: 6f60833
Author: Jessica Wang <je...@apache.org>
Authored: Thu Apr 25 16:03:02 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Apr 25 16:03:02 2013 -0700
----------------------------------------------------------------------
ui/scripts/regions.js | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64635abb/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index 334eb26..2bbbbee 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -461,18 +461,27 @@
id: 'lbUnderGSLB',
label: 'assigned load balancing',
fields: {
- 'name': { label: 'label.name' },
+ name: { label: 'label.name' },
publicport: { label: 'label.public.port' },
- privateport: { label: 'label.private.port' },
- algorithm: { label: 'label.algorithm' }
+ privateport: { label: 'label.private.port' },
+ algorithm: { label: 'label.algorithm' }
},
- dataProvider: function(args) {
- var items = args.context.GSLB[0].loadbalancerrule;
- args.response.success({
- data: items
- });
+ dataProvider: function(args) {
+ var data = {
+ id: args.context.GSLB[0].id
+ };
+ $.ajax({
+ url: createURL('listGlobalLoadBalancerRules'),
+ data: data,
+ success: function(json) {
+ var items = json.listgloballoadbalancerrulesresponse.globalloadbalancerrule[0].loadbalancerrule;
+ args.response.success({
+ data: items
+ });
+ }
+ });
},
- actions: {
+ actions: {
add: {
label: 'assign more load balancing',
messages: {