X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/67df302167539474edd02b57c2e8bd30349d7625..ee7f2fa4a7e08ca2f8c88f2a521ef65cbca3aac4:/apps/catalogue/fields.py?ds=inline diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py index 11c730c71..390fb0359 100644 --- a/apps/catalogue/fields.py +++ b/apps/catalogue/fields.py @@ -6,15 +6,10 @@ import datetime from django.conf import settings from django.db import models -from django.db.models import signals +from django.db.models.fields.files import FieldFile from django import forms -from django.forms.widgets import flatatt -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 south.modelsinspector import add_introspection_rules class JSONEncoder(json.JSONEncoder): @@ -53,7 +48,7 @@ class JSONField(models.TextField): 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): @@ -70,60 +65,31 @@ class JSONField(models.TextField): return setattr(model_instance, self.attname, dumps(json)) setattr(cls, 'set_%s_value' % self.name, set_value) -add_introspection_rules([], ["^catalogue\.fields\.JSONField"]) +class OverwritingFieldFile(FieldFile): + """ + Deletes the old file before saving the new one. + """ -class JQueryAutoCompleteWidget(forms.TextInput): - def __init__(self, source, options=None, *args, **kwargs): - self.source = source - self.options = None - if options: - self.options = dumps(options) - super(JQueryAutoCompleteWidget, self).__init__(*args, **kwargs) + def save(self, name, content, *args, **kwargs): + leave = kwargs.pop('leave', None) + # delete if there's a file already and there's a new one coming + if not leave and self and (not hasattr(content, 'path') or + content.path != self.path): + self.delete(save=False) + return super(OverwritingFieldFile, self).save( + name, content, *args, **kwargs) - def render_js(self, field_id): - source = "'%s'" % escape(self.source) - options = '' - if self.options: - options += ', %s' % self.options - return u'$(\'#%s\').autocomplete(%s%s).result(autocomplete_result_handler);' % (field_id, source, options) +class OverwritingFileField(models.FileField): + attr_class = OverwritingFieldFile - def render(self, name, value=None, attrs=None): - final_attrs = self.build_attrs(attrs, name=name) - if value: - final_attrs['value'] = smart_unicode(value) - - if not self.attrs.has_key('id'): - final_attrs['id'] = 'id_%s' % name - - html = u''' - - ''' % { - 'attrs' : flatatt(final_attrs), - 'js' : self.render_js(final_attrs['id']), - } - - return mark_safe(html) - - -class JQueryAutoCompleteField(forms.CharField): - def __init__(self, source, options=None, *args, **kwargs): - if 'widget' not in kwargs: - kwargs['widget'] = JQueryAutoCompleteWidget(source, options) - - super(JQueryAutoCompleteField, self).__init__(*args, **kwargs) try: # check for south from south.modelsinspector import add_introspection_rules - add_introspection_rules([ - ( - [JSONField], # Class(es) these apply to - [], # Positional arguments (not used) - {}, # Keyword argument - ), ], ["^catalogue\.fields\.JSONField"]) + add_introspection_rules([], ["^catalogue\.fields\.JSONField"]) + add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"]) except ImportError: pass