diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 0ec275ad9a2..704f3991395 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -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),