entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

attribute_kinds: make a lazy iterator from get_title_choices() (fixes #10200) 

Being lazy allows late binding in multitenant context where the settings changes
between requests.
This commit is contained in:
Benjamin Dauvergne 2016-03-04 11:39:31 +01:00
parent 402871c428
commit dce8023c22
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/authentic2/attribute_kinds.py
View File

@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext_lazy
from django.utils.functional import allow_lazy
from django.template.defaultfilters import capfirst
from .decorators import to_list
from .decorators import to_iter
from . import app_settings
capfirst = allow_lazy(capfirst, unicode)
@ -20,6 +20,7 @@ DEFAULT_TITLE_CHOICES = (
(pgettext_lazy('title', 'Mr'), pgettext_lazy('title', 'Mr')),
)
@to_iter
def get_title_choices():
return app_settings.A2_ATTRIBUTE_KIND_TITLE_CHOICES or DEFAULT_TITLE_CHOICES
@ -46,7 +47,7 @@ def get_attribute_kinds():
attribute_kinds[attribute_kind['name']] = attribute_kind
return attribute_kinds
@to_list
@to_iter
def get_choices():
'''Produce a choice list to use in form fields'''
for d in get_attribute_kinds().itervalues():