External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-04 10:58:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix configure Tower in Tower to work with updated django-jsonfield.

Browse Source
This commit is contained in:
Chris Church
2016-11-15 00:22:55 -05:00
parent f5d3e1885e
commit 8dc5e7725c
7 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/fields.py
View File

@@ -33,8 +33,6 @@ __all__ = ['AutoOneToOneField', 'ImplicitRoleField', 'JSONField']
class JSONField(upstream_JSONField):
def from_db_value(self, value, expression, connection, context):
if value in ['', None]:
return {}
return super(JSONField, self).from_db_value(value, expression, connection, context)
# Based on AutoOneToOneField from django-annoying: