fixes #540: load all sponsors at once

[wolnelektury.git] / apps / catalogue / fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index ded6f0e..e2d94b9 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -9,12 +9,11 @@ from django.db import models
 from django.db.models import signals
 from django import forms
 from django.forms.widgets import flatatt
 from django.db.models import signals
 from django import forms
 from django.forms.widgets import flatatt

-from django.forms.util import smart_unicode
+from django.utils.encoding import smart_unicode

 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 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 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):


@@ -123,7 +120,7 @@ try:
     (
         [JSONField], # Class(es) these apply to
         [], # Positional arguments (not used)
     (
         [JSONField], # Class(es) these apply to
         [], # Positional arguments (not used)

-        {}, # Keyword argument           
+        {}, # Keyword argument

     ), ], ["^catalogue\.fields\.JSONField"])
 except ImportError:
     pass
     ), ], ["^catalogue\.fields\.JSONField"])
 except ImportError:
     pass