Merge back fixes into master

This commit is contained in:
Griatch 2017-10-01 16:51:41 +02:00
parent 5871e64681
commit a8603975a1
4 changed files with 14 additions and 5 deletions

View file

@ -575,6 +575,10 @@ class TypedObject(SharedMemoryModel):
ppos = _PERMISSION_HIERARCHY.index(perm)
return any(True for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
if hperm in perms and hpos > ppos)
# we ignore pluralization (english only)
if perm.endswith("s"):
return self.check_permstring(perm[:-1])
return False
#