fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
librarian fix
[wolnelektury.git]
/
apps
/
catalogue
/
fields.py
diff --git
a/apps/catalogue/fields.py
b/apps/catalogue/fields.py
index
11c730c
..
e2d94b9
100644
(file)
--- a/
apps/catalogue/fields.py
+++ b/
apps/catalogue/fields.py
@@
-14,7
+14,6
@@
from django.utils import simplejson as json
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
-from south.modelsinspector import add_introspection_rules
class JSONEncoder(json.JSONEncoder):
class JSONEncoder(json.JSONEncoder):
@@
-53,7
+52,7
@@
class JSONField(models.TextField):
defaults.update(kwargs)
return super(JSONField, self).formfield(**defaults)
defaults.update(kwargs)
return super(JSONField, self).formfield(**defaults)
- def db_type(self):
+ def db_type(self
, connection
):
return 'text'
def get_internal_type(self):
return 'text'
def get_internal_type(self):
@@
-70,8
+69,6
@@
class JSONField(models.TextField):
return setattr(model_instance, self.attname, dumps(json))
setattr(cls, 'set_%s_value' % self.name, set_value)
return setattr(model_instance, self.attname, dumps(json))
setattr(cls, 'set_%s_value' % self.name, set_value)
-add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
-
class JQueryAutoCompleteWidget(forms.TextInput):
def __init__(self, source, options=None, *args, **kwargs):
class JQueryAutoCompleteWidget(forms.TextInput):
def __init__(self, source, options=None, *args, **kwargs):