apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1211 from ustcweizhou/delete-acl-items

Browse Source 
[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 <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-12-12 14:40:16 +01:00
commit 1597a4c749
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/vpc.js
View File

@ -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;
}