etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to master 

* 4.8:
  Improve ordering of fields of VPC router detail tab
This commit is contained in:
Will Stevens 2016-04-11 08:46:35 -04:00
parent 6dc514738f 594fe53f6d
commit 67b4e66414
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ui/scripts/network.js
View File

@ -5838,35 +5838,14 @@
label: 'label.name'
}
}, {
id: {
label: 'label.id'
},
zonename: {
label: 'label.zone'
},
dns1: {
label: 'label.dns'
},
gateway: {
label: 'label.gateway'
},
publicip: {
label: 'label.public.ip'
},
guestipaddress: {
label: 'label.guest.ip'
},
linklocalip: {
label: 'label.linklocal.ip'
state: {
label: 'label.state'
},
hostname: {
label: 'label.host'
},
state: {
label: 'label.state'
},
serviceofferingname: {
label: 'label.service.offering'
linklocalip: {
label: 'label.linklocal.ip'
},
isredundantrouter: {
label: 'label.redundant.router',
@ -5877,6 +5856,30 @@
return "No";
}
},
redundantstate: {
label: 'label.redundant.state'
},
id: {
label: 'label.id'
},
serviceofferingname: {
label: 'label.service.offering'
},
zonename: {
label: 'label.zone'
},
gateway: {
label: 'label.gateway'
},
publicip: {
label: 'label.public.ip'
},
guestipaddress: {
label: 'label.guest.ip'
},
dns1: {
label: 'label.dns'
},
account: {
label: 'label.account'
},
@ -5884,6 +5887,7 @@
label: 'label.domain'
}
}],
dataProvider: function(args) {
$.ajax({
url: createURL("listRouters&listAll=true&vpcid=" + args.context.vpc[0].id),