[UI] bug fix: vpn configuration does not show ipsec presharedkey
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec55f5ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec55f5ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec55f5ca Branch: refs/heads/4.3 Commit: ec55f5ca961be1d36509548e1e318ae4208057bd Parents: fe1cdbd Author: Wei Zhou <[email protected]> Authored: Thu Jul 3 11:14:03 2014 +0200 Committer: Wei Zhou <[email protected]> Committed: Thu Jul 3 11:20:37 2014 +0200 ---------------------------------------------------------------------- ui/scripts/network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec55f5ca/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 2cb3973..beab1a9 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2259,7 +2259,7 @@ _custom: { getUpdatedItem: function(json) { return { - vpn: json.queryasyncjobresultresponse.jobresult.remoteaccessvpn, + remoteaccessvpn: json.queryasyncjobresultresponse.jobresult.remoteaccessvpn, vpnenabled: true }; }, @@ -2283,7 +2283,7 @@ return 'label.enable.vpn'; }, complete: function(args) { - return _l('message.enabled.vpn') + ' ' + args.vpn.publicip + '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.vpn.presharedkey; + return _l('message.enabled.vpn') + ' ' + args.remoteaccessvpn.publicip + '.' + '<br/>' + _l('message.enabled.vpn.ip.sec') + '<br/>' + args.remoteaccessvpn.presharedkey; } }, notification: {
