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 2015/12/12 14:40:48 UTC
[1/2] git commit: updated refs/heads/4.6 to 1597a4c
Repository: cloudstack
Updated Branches:
refs/heads/4.6 8c78f89c9 -> 1597a4c74
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/709e0c55
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/709e0c55
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/709e0c55
Branch: refs/heads/4.6
Commit: 709e0c555e5896f5f2abe16f9ba029010b4f42cc
Parents: 3515f57
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Dec 10 14:09:45 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Dec 10 14:09:45 2015 +0100
----------------------------------------------------------------------
ui/scripts/vpc.js | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/709e0c55/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 41d10ed..4b10d8b 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -638,7 +638,7 @@
args.response.success({
_custom: {
jobId: jobID,
- getUpdateIdtem: function() {
+ getUpdatedItem: function() {
$(window).trigger('cloudStack.fullRefresh');
}
},
@@ -1225,12 +1225,19 @@
url: createURL('createNetworkACLList&vpcid=' + args.context.vpc[0].id),
data: data,
success: function(json) {
- var items = json.createnetworkacllistresponse;
args.response.success({
- data: items
+ _custom: {
+ jobId: json.createnetworkacllistresponse.jobid,
+ getUpdatedItem: function(json) {
+ return json.queryasyncjobresultresponse.jobresult.networkacllist;
+ }
+ }
});
}
});
+ },
+ notification: {
+ poll: pollAsyncJobResult
}
}
},
@@ -1255,7 +1262,10 @@
var jid = json.deletenetworkacllistresponse.jobid;
args.response.success({
_custom: {
- jobId: jid
+ jobId: jid,
+ getUpdatedItem: function() {
+ $(window).trigger('cloudStack.fullRefresh');
+ }
}
});
},
@@ -1292,9 +1302,8 @@
data: items,
actionFilter: function(args) {
var allowedActions = [];
- if (isAdmin() && items.vpcid) {
+ if (items.vpcid != null) {
allowedActions.push("remove");
-
}
return allowedActions;
}
[2/2] git commit: updated refs/heads/4.6 to 1597a4c
Posted by re...@apache.org.
Merge pull request #1211 from ustcweizhou/delete-acl-items
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal usersOnly the owner or domain admin/admin can access the page (vpc->Network ACL Lists), they are also able to remove the network ACL lists, which is not allowed on UI.
* pr/1211:
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users
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/1597a4c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1597a4c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1597a4c7
Branch: refs/heads/4.6
Commit: 1597a4c749c98383b838d88e8307eebc370012f4
Parents: 8c78f89 709e0c5
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 14:40:16 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 14:40:17 2015 +0100
----------------------------------------------------------------------
ui/scripts/vpc.js | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------