External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix to maintain Django 1.4 compatibility.

Browse Source
This commit is contained in:
Chris Church
2013-08-20 16:46:14 -04:00
parent fc68955bad
commit e594296c9b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/compat.py
View File

@@ -24,3 +24,8 @@ except ImportError:
class RequireDebugTrue(logging.Filter): class RequireDebugTrue(logging.Filter):
def filter(self, record): def filter(self, record):
return settings.DEBUG return settings.DEBUG
try:
from django.utils.text import slugify
except ImportError:
from django.template.defaultfilters import slugify

4
awx/main/models/__init__.py
View File

@@ -19,7 +19,6 @@ from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.text import slugify
# Django-JSONField # Django-JSONField
from jsonfield import JSONField from jsonfield import JSONField
@@ -30,6 +29,9 @@ from taggit.managers import TaggableManager
# Django-Celery # Django-Celery
from djcelery.models import TaskMeta from djcelery.models import TaskMeta
# AWX
from awx.main.compat import slugify
__all__ = ['PrimordialModel', 'Organization', 'Team', 'Project', __all__ = ['PrimordialModel', 'Organization', 'Team', 'Project',
'ProjectUpdate', 'Credential', 'Inventory', 'Host', 'Group', 'ProjectUpdate', 'Credential', 'Inventory', 'Host', 'Group',
'Permission', 'JobTemplate', 'Job', 'JobHostSummary', 'JobEvent', 'Permission', 'JobTemplate', 'Job', 'JobHostSummary', 'JobEvent',