YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #836 from kay0u/patch-1

Browse source 
Add arg in permission callback
This commit is contained in:
Alexandre Aubin 2019-11-14 17:36:56 +01:00 • committed by GitHub
commit 9defb30133
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/permission.py
View file

@ -179,6 +179,7 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
# Trigger app callbacks
app = permission.split(".")[0]
sub_permission = permission.split(".")[1]
old_allowed_users = set(existing_permission["corresponding_users"])
new_allowed_users = set(new_permission["corresponding_users"])
@ -187,9 +188,9 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
effectively_removed_users = old_allowed_users - new_allowed_users
if effectively_added_users:
hook_callback('post_app_addaccess', args=[app, ','.join(effectively_added_users)])
hook_callback('post_app_addaccess', args=[app, ','.join(effectively_added_users), sub_permission])
if effectively_removed_users:
hook_callback('post_app_removeaccess', args=[app, ','.join(effectively_removed_users)])
hook_callback('post_app_removeaccess', args=[app, ','.join(effectively_removed_users), sub_permission])
return new_permission
@ -241,6 +242,7 @@ def user_permission_reset(operation_logger, permission, sync_perm=True):
# Trigger app callbacks
app = permission.split(".")[0]
sub_permission = permission.split(".")[1]
old_allowed_users = set(existing_permission["corresponding_users"])
new_allowed_users = set(new_permission["corresponding_users"])
@ -249,9 +251,9 @@ def user_permission_reset(operation_logger, permission, sync_perm=True):
effectively_removed_users = old_allowed_users - new_allowed_users
if effectively_added_users:
hook_callback('post_app_addaccess', args=[app, ','.join(effectively_added_users)])
hook_callback('post_app_addaccess', args=[app, ','.join(effectively_added_users), sub_permission])
if effectively_removed_users:
hook_callback('post_app_removeaccess', args=[app, ','.join(effectively_removed_users)])
hook_callback('post_app_removeaccess', args=[app, ','.join(effectively_removed_users), sub_permission])
return new_permission