Support ModelStorage.search API in ResourceAccessMixin
ResourceAccessMixin inherits from ModelStorage so it should support the ModelStorage.search API. Closes #14900 (grafted from 0011c5048a75906493f45a752958733d8cae5f12) --HG-- branch : 8.0
This commit is contained in:
@@ -70,13 +70,14 @@ class ResourceAccessMixin(ModelStorage):
|
||||
@classmethod
|
||||
def search(
|
||||
cls, domain, offset=0, limit=None, order=None, count=False,
|
||||
query=False):
|
||||
**kwargs):
|
||||
transaction = Transaction()
|
||||
enforce_access = (
|
||||
not query and transaction.user and transaction.check_access)
|
||||
not kwargs.get('query', False)
|
||||
and transaction.user and transaction.check_access)
|
||||
result = super().search(
|
||||
domain, offset=offset, limit=limit, order=order,
|
||||
count=False if enforce_access else count, query=query)
|
||||
count=False if enforce_access else count, **kwargs)
|
||||
if not enforce_access:
|
||||
return result
|
||||
|
||||
@@ -110,7 +111,7 @@ class ResourceAccessMixin(ModelStorage):
|
||||
loop += 1
|
||||
result = super().search(
|
||||
domain, offset=offset + loop * limit, limit=limit, order=order,
|
||||
count=False, query=False)
|
||||
count=False)
|
||||
if not result:
|
||||
break
|
||||
|
||||
|
||||
Reference in New Issue
Block a user