Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Version 1.3b7 - fixes registration when there is no app config

Browse source
This commit is contained in:
Corey Oordt 2015-05-18 18:12:06 -05:00
parent e841de7aca
commit 02780ba2a1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
categories/__init__.py
View file

@ -3,7 +3,7 @@ __version_info__ = {
'minor': 3,
'micro': 0,
'releaselevel': 'beta',
'serial': 6
'serial': 7
}

9
categories/registration.py
View file

@ -30,20 +30,21 @@ class Registry(object):
from django.apps import apps
import collections
app_config = apps.get_app_config(app)
app_label = app_config.label
app_label = app
if isinstance(field_definitions, basestring):
field_definitions = [field_definitions]
elif not isinstance(field_definitions, collections.Iterable):
raise ImproperlyConfigured(_('Field configuration for %(app)s should '
'be a string or iterable') % {'app': app_config.label})
'be a string or iterable') % {'app': app})
if field_type not in ('ForeignKey', 'ManyToManyField'):
raise ImproperlyConfigured(_('`field_type` must be either `"ForeignKey"` or `"ManyToManyField"`.'))
try:
if not hasattr(model_name, "_meta"):
app_config = apps.get_app_config(app)
app_label = app_config.label
model = app_config.get_model(model_name)
else:
model = model_name
@ -77,7 +78,7 @@ class Registry(object):
'settings': 'CATEGORY_SETTINGS',
'app': app,
'model': model_name})
registry_name = ".".join([app_config.label, model_name.lower(), field_name])
registry_name = ".".join([app_label, model_name.lower(), field_name])
if registry_name in self._field_registry:
continue