matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Navigation: Related field support to SourceColumn

Browse Source 
Add support to the SourceColumn class to resolve related fields
using the double underscore as separator. Columns that use related
no longer have to use throw away lambdas.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-14 01:43:51 -04:00
parent 68995adb7f
commit 1efec6bd41
6 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/acls/managers.py
View File

@@ -9,7 +9,7 @@ from django.db.models import Q
from django.utils.translation import ugettext
from django.utils.translation import ugettext_lazy as _
from mayan.apps.common.utils import return_attrib, return_related
from mayan.apps.common.utils import resolve_attribute, return_related
from mayan.apps.permissions import Permission
from mayan.apps.permissions.models import StoredPermission
@@ -46,7 +46,7 @@ class AccessControlListManager(models.Manager):
stored_permissions = (permissions.stored_permission,)
if related:
obj = return_attrib(obj, related)
obj = resolve_attribute(obj, related)
try:
parent_accessor = ModelPermission.get_inheritance(
@@ -199,7 +199,7 @@ class AccessControlListManager(models.Manager):
return StoredPermission.objects.none()
else:
try:
parent_object = return_attrib(
parent_object = resolve_attribute(
obj=instance, attrib=parent_accessor
)
except AttributeError: