Finished adding encapsulation to lambda functions to get around Django bug #15791

This commit is contained in:
Roberto Rosario
2011-08-05 09:46:28 -04:00
parent 1b7183be85
commit 2169bbd0d2
3 changed files with 4 additions and 3 deletions

View File

@@ -8,6 +8,7 @@ from django.utils.safestring import mark_safe
from permissions.api import check_permissions from permissions.api import check_permissions
from documents.literals import PERMISSION_DOCUMENT_VIEW from documents.literals import PERMISSION_DOCUMENT_VIEW
from documents.models import Document from documents.models import Document
from common.utils import encapsulate
from document_indexing import PERMISSION_DOCUMENT_INDEXING_VIEW, \ from document_indexing import PERMISSION_DOCUMENT_INDEXING_VIEW, \
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES
@@ -45,7 +46,7 @@ def index_instance_list(request, index_id=None):
'extra_columns_preffixed': [ 'extra_columns_preffixed': [
{ {
'name': _(u'item'), 'name': _(u'item'),
'attribute': lambda x: index_instance_item_link(x) 'attribute': encapsulate(lambda x: index_instance_item_link(x))
} }
], ],
'title': title, 'title': title,

View File

@@ -332,7 +332,7 @@ def document_page_transformation_list(request, document_page_id):
'list_object_variable_name': 'transformation', 'list_object_variable_name': 'transformation',
'extra_columns': [ 'extra_columns': [
{'name': _(u'order'), 'attribute': 'order'}, {'name': _(u'order'), 'attribute': 'order'},
{'name': _(u'transformation'), 'attribute': lambda x: x.get_transformation_display()}, {'name': _(u'transformation'), 'attribute': encapsulate(lambda x: x.get_transformation_display())},
{'name': _(u'arguments'), 'attribute': 'arguments'} {'name': _(u'arguments'), 'attribute': 'arguments'}
], ],
'hide_link': True, 'hide_link': True,

View File

@@ -339,7 +339,7 @@ def setup_queue_transformation_list(request, document_queue_id):
'list_object_variable_name': 'transformation', 'list_object_variable_name': 'transformation',
'extra_columns': [ 'extra_columns': [
{'name': _(u'order'), 'attribute': 'order'}, {'name': _(u'order'), 'attribute': 'order'},
{'name': _(u'transformation'), 'attribute': lambda x: x.get_transformation_display()}, {'name': _(u'transformation'), 'attribute': encapsulate(lambda x: x.get_transformation_display())},
{'name': _(u'arguments'), 'attribute': 'arguments'} {'name': _(u'arguments'), 'attribute': 'arguments'}
], ],
'hide_link': True, 'hide_link': True,