diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 77c528f2ed1..a9f7381e641 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -137,6 +137,19 @@ }); } + if ("routers" in args.context) { + if ("account" in args.context.routers[0]) { + $.extend(data, { + name: args.context.routers[0].account + }); + } + if ("domainid" in args.context.routers[0]) { + $.extend(data, { + domainid: args.context.routers[0].domainid + }); + } + } + $.ajax({ url: createURL('listAccounts'), data: data, diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 252eb1ac84b..ca77c27e6b1 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -379,6 +379,31 @@ }); } + if ("routers" in args.context) { + if ("vpcid" in args.context.routers[0]) { + $.extend(data, { + vpcid: args.context.routers[0].vpcid + }); + } else { + if ("guestnetworkid" in args.context.routers[0]) { + $.extend(data, { + networkid: args.context.routers[0].guestnetworkid + }); + } + } + if ("projectid" in args.context.routers[0]) { + $.extend(data, { + projectid: args.context.routers[0].projectid + }); + } + } + + if ("networks" in args.context) { + $.extend(data, { + networkid: args.context.networks[0].id + }); + } + if ("templates" in args.context) { $.extend(data, { templateid: args.context.templates[0].id diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 83701065c60..7ffb16dcd94 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -914,6 +914,25 @@ var data = {}; listViewDataProvider(args, data); + if ("routers" in args.context) { + if ("vpcid" in args.context.routers[0]) { + $.extend(data, { + vpcid: args.context.routers[0].vpcid + }); + } else { + if ("guestnetworkid" in args.context.routers[0]) { + $.extend(data, { + id: args.context.routers[0].guestnetworkid + }); + } + } + if ("projectid" in args.context.routers[0]) { + $.extend(data, { + projectid: args.context.routers[0].projectid + }); + } + } + $.ajax({ url: createURL('listNetworks'), data: data, @@ -931,7 +950,7 @@ detailView: { name: 'label.guest.network.details', - viewAll: { + viewAll: [{ path: 'network.ipAddresses', label: 'label.menu.ipaddresses', preFilter: function(args) { @@ -940,7 +959,10 @@ return true; } - }, + }, { + label: 'label.instances', + path: 'instances' + }], actions: { edit: { label: 'label.edit', @@ -6334,7 +6356,6 @@ } }, action: function(args) { - console.log(args.context); $.ajax({ url: createURL('removeVpnUser'), data: { diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e912f3b3ce8..9fc96ce5f66 100755 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -31,6 +31,7 @@ if (router.projectid) routerType = _l('label.project'); if (router.vpcid) routerType = _l('label.vpc'); + if ("isredundantrouter" in router && router.isredundantrouter) routerType = routerType + " (" + router.redundantstate + ")"; return $.extend(router, { routerType: routerType @@ -9599,6 +9600,23 @@ }, detailView: { name: 'label.virtual.appliance.details', + viewAll: [{ + label: 'label.account', + path: 'accounts', + preFilter: function(args) { + if (args.context.routers[0].projectid) + return false; + if (args.context.routers[0].account == 'system') + return false; + return true; + } + }, { + label: 'label.networks', + path: 'network', + }, { + label: 'label.instances', + path: 'instances' + }], actions: { start: { label: 'label.action.start.router',