Updated Branches: refs/heads/master 8ece25c1f -> 7934b1631
CLOUDSTACK-2745: UI - Internal LB Rules - (1) detailView: remove Rules tab and add source port, instance port in Details tab. (2) Create Internal LB Rule dialog: corret label of source port and instance port. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7934b163 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7934b163 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7934b163 Branch: refs/heads/master Commit: 7934b163175fe79575e2722a1681710aa70d7895 Parents: 8ece25c Author: Jessica Wang <[email protected]> Authored: Thu May 30 17:06:22 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu May 30 17:06:22 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7934b163/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 3581b88..81f3818 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -351,7 +351,8 @@ id: 'internalLoadBalancers', fields: { name: { label: 'label.name' }, - sourceipaddress: { label: 'Source IP Address' } + sourceipaddress: { label: 'Source IP Address' }, + algorithm: { label: 'label.algorithm' } }, dataProvider: function(args) { $.ajax({ @@ -375,8 +376,8 @@ name: { label: 'label.name', validation: { required: true } }, description: { label: 'label.description', validation: { required: false } }, sourceipaddress: { label: 'Source IP Address', validation: { required: false } }, - sourceport: { label: 'sourceport', validation: { required: true } }, - instanceport: { label: 'instanceport', validation: { required: true } }, + sourceport: { label: 'Source Port', validation: { required: true } }, + instanceport: { label: 'Instance Port', validation: { required: true } }, algorithm: { label: 'label.algorithm', validation: { required: true }, @@ -518,7 +519,12 @@ name: { label: 'label.name' } }, { - id: { label: 'label.id' } + id: { label: 'label.id' }, + description: { label: 'label.description' }, + sourceipaddress: { label: 'Source IP Address' }, + sourceport: { label: 'Source Port' }, + instanceport: { label: 'Instance Port' }, + algorithm: { label: 'label.algorithm' } } ], dataProvider: function(args) { @@ -529,11 +535,18 @@ }, success: function(json) { var item = json.listloadbalancerssresponse.loadbalancer[0]; + + //remove Rules tab and add sourceport, instanceport at Details tab because there is only one element in loadbalancerrul array property. + item.sourceport = item.loadbalancerrule[0].sourceport; + item.instanceport = item.loadbalancerrule[0].instanceport; + args.response.success({ data: item }); } }); } - }, + }, + + /* rules: { title: 'label.rules', multiple: true, @@ -555,7 +568,9 @@ } }); } - } , + }, + */ + assignedVms: { title: 'Assigned VMs', multiple: true,
