You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/16 19:41:36 UTC
[1/2] git commit: updated refs/heads/4.7 to 146a6fd
Repository: cloudstack
Updated Branches:
refs/heads/4.7 1b5c64578 -> 146a6fd3e
CLOUDSTACK-9192: UpdateVpnCustomerGateway is failing
The response name was wrong so corrected it.
Added the error function.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/116b2b69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/116b2b69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/116b2b69
Branch: refs/heads/4.7
Commit: 116b2b691ffe73037165507144e7dd7eee150623
Parents: d681574
Author: Nitin Kumar Maharana <ni...@gmail.com>
Authored: Mon Dec 21 16:04:17 2015 +0530
Committer: Nitin Kumar Maharana <ni...@gmail.com>
Committed: Wed Jan 6 23:49:41 2016 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/116b2b69/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 2831aa0..393f440 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -6219,7 +6219,7 @@
url: createURL('updateVpnCustomerGateway'),
data: data,
success: function(json) {
- var jobId = json.updatecustomergatewayresponse.jobid;
+ var jobId = json.updatevpncustomergatewayresponse.jobid;
args.response.success({
_custom: {
jobId: jobId,
@@ -6231,6 +6231,9 @@
}
}
});
+ },
+ error: function(json) {
+ args.response.error(parseXMLHttpResponse(json));
}
});
},
[2/2] git commit: updated refs/heads/4.7 to 146a6fd
Posted by re...@apache.org.
Merge pull request #1300 from nitin-maharana/CloudStack-Nitin10_4.7
CLOUDSTACK-9192: UpdateVpnCustomerGateway is failingReproducible Steps:
================
1.Create a customer gateway for a VPC.
2.Edit it using UI(API call is UpdateVpnCustomerGateway).
3.When we try to update the customer vpn gateway with connection state is not in "Error", we see the API error but that won't be reflected to the user in UI.
Actual Behaviour:
==============
The API throws error. But UI doesn't show it to user.
Expected Behaviour:
================
The UI should show the error to user.
Fix:
===
TypeError: json.updatecustomergatewayresponse is undefined
The response name was wrong so corrected it.
It should be json.updatevpncustomergatewayresponse.
Added the error function.
* pr/1300:
CLOUDSTACK-9192: UpdateVpnCustomerGateway is failing
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/146a6fd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/146a6fd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/146a6fd3
Branch: refs/heads/4.7
Commit: 146a6fd3ec9e94dd0715e43a72d9f780d7763b04
Parents: 1b5c645 116b2b6
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Jan 16 19:41:04 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Jan 16 19:41:04 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/146a6fd3/ui/scripts/network.js
----------------------------------------------------------------------