shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

AC-1020 Fix django-jsonfield to avoid generating PostgreSQL error.

Browse Source
This commit is contained in:
Chris Church 2014-02-07 17:09:08 -05:00
parent 455ed2bc63
commit 8638f1e3d1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/lib/site-packages/README
View File

@ -17,7 +17,7 @@ distribute==0.7.3 (no files)
django-auth-ldap==1.1.7 (django_auth_ldap/*)
django-celery==3.1.1 (djcelery/*)
django-extensions==1.2.5 (django_extensions/*)
django-jsonfield==0.9.12 (jsonfield/*)
django-jsonfield==0.9.12 (jsonfield/*, minor fix in jsonfield/fields.py)
django-split-settings==0.1.1 (split_settings/*)
django-taggit==0.11.2 (taggit/*)
djangorestframework==2.3.10 (rest_framework/*)

2
awx/lib/site-packages/jsonfield/fields.py
View File

@ -69,6 +69,8 @@ class JSONField(six.with_metaclass(models.SubfieldBase, models.Field)):
return 'TextField'
def db_type(self, connection):
return 'text' # HACK: Fix for Ansible Tower to avoid generating errors
# in PostgreSQL log.
cache_key = DB_TYPE_CACHE_KEY % connection.settings_dict
db_type = cache.get(cache_key)