Updated Branches: refs/heads/master 7de6992fa -> a5edef06c
CLOUDSTACK-256 vpn:As an admin user , not able to delete VPN user which is present in a regular user's network. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a5edef06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a5edef06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a5edef06 Branch: refs/heads/master Commit: a5edef06c93b8bbbad28b9ccc4bc0f060d229224 Parents: 7de6992 Author: Mice Xia <[email protected]> Authored: Wed Oct 10 13:42:46 2012 +0800 Committer: Mice Xia <[email protected]> Committed: Wed Oct 10 13:43:30 2012 +0800 ---------------------------------------------------------------------- ui/scripts/network.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5edef06/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 49644c2..520998a 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3083,7 +3083,9 @@ url: createURL('removeVpnUser'), data: { username: args.context.multiRule[0].username, - id: args.context.multiRule[0].domainid + id: args.context.multiRule[0].domainid, + account: args.context.ipAddresses[0].account, + domainid: args.context.ipAddresses[0].domainid }, dataType: 'json', async: true,
