archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-05-06 19:11:21 +02:00
parent 2cdde04a8b
commit 402981a6b1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/application/utils/authorization.py
View File

@@ -164,7 +164,7 @@ def merge_permissions(*args):
for key in maybe_sorted(keys): for key in maybe_sorted(keys):
methods0 = asdict0.get(key, []) methods0 = asdict0.get(key, [])
methods1 = asdict1.get(key, []) methods1 = asdict1.get(key, [])
methods = maybe_sorted(set(methods0 + methods1)) methods = maybe_sorted(set(methods0).union(set(methods1)))
effective.setdefault(plural_name, []).append({field_name: key, u'methods': methods}) effective.setdefault(plural_name, []).append({field_name: key, u'methods': methods})
merge(u'user') merge(u'user')
@@ -173,7 +173,7 @@ def merge_permissions(*args):
# Gather permissions for world # Gather permissions for world
world0 = args[0].get('world', []) world0 = args[0].get('world', [])
world1 = args[1].get('world', []) world1 = args[1].get('world', [])
world_methods = set(world0 + world1) world_methods = set(world0).union(set(world1))
if world_methods: if world_methods:
effective[u'world'] = maybe_sorted(world_methods) effective[u'world'] = maybe_sorted(world_methods)