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

Add widget support to SourceColumn

Browse Source 
Allow passing a widget class to SourceColumn. This makes
using lambdas to render model column unnecesary and are
mostly removed too.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-22 05:35:31 -04:00
parent 360e756093
commit 64e1c6bb67
59 changed files with 450 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mayan/apps/navigation/classes.py
View File

@@ -15,10 +15,13 @@ from django.template import VariableDoesNotExist, Variable
from django.template.defaulttags import URLNode
from django.urls import Resolver404, resolve
from django.utils.encoding import force_str, force_text
from django.utils.translation import ugettext_lazy as _
from mayan.apps.common.utils import resolve_attribute
from mayan.apps.permissions import Permission
from .exceptions import NavigationError
logger = logging.getLogger(__name__)
@@ -527,10 +530,11 @@ class SourceColumn(object):
else:
return result
def __init__(self, source, label=None, attribute=None, func=None, kwargs=None, order=None, is_identifier=False):
def __init__(self, source, attribute=None, empty_value=None, func=None, is_identifier=False, kwargs=None, label=None, order=None, widget=None):
self.source = source
self._label = label
self.attribute = attribute
self.empty_value = empty_value
self.func = func
self.kwargs = kwargs or {}
self.order = order or 0
@@ -538,20 +542,29 @@ class SourceColumn(object):
self.__class__._registry.setdefault(source, [])
self.__class__._registry[source].append(self)
self.label = None
self.widget = widget
if not attribute and not func:
raise NavigationError(
'Must provide either an attribute or a function'
)
self._calculate_label()
def _calculate_label(self):
if not self._label:
if self.attribute:
name, model = SourceColumn.get_attribute_recursive(
attribute=self.attribute, model=self.source._meta.model
)
self._label = label_for_field(
name=name, model=model
)
try:
attribute = resolve_attribute(obj=self.source, attribute=self.attribute)
self._label = getattr(attribute, 'short_description')
except AttributeError:
name, model = SourceColumn.get_attribute_recursive(
attribute=self.attribute, model=self.source._meta.model
)
self._label = label_for_field(
name=name, model=model
)
else:
self._label = 'Function'
self._label = getattr(self.func, 'short_description', _('Unnamed function'))
self.label = self._label
@@ -564,7 +577,17 @@ class SourceColumn(object):
elif self.func:
result = self.func(context=context, **self.kwargs)
return result
if self.widget:
widget_instance = self.widget()
return widget_instance.render(name='asd', value=result)
if not result:
if self.empty_value:
return self.empty_value
else:
return result
else:
return result
class Text(Link):