X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e46d532c86f034d0edd00d90fb7f16884d422dd5..4af4ef861ca5d4f1684fa0f36a91c2632bbff1bc:/apps/catalogue/fields.py
diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 0478f9d1b..5ab78eb03 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -2,113 +2,33 @@
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
-import datetime
-
-from django.conf import settings
from django.db import models
-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 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 _
-
-
-class JSONEncoder(json.JSONEncoder):
- def default(self, obj):
- if isinstance(obj, datetime.datetime):
- return obj.strftime('%Y-%m-%d %H:%M:%S')
- elif isinstance(obj, datetime.date):
- return obj.strftime('%Y-%m-%d')
- elif isinstance(obj, datetime.time):
- return obj.strftime('%H:%M:%S')
- return json.JSONEncoder.default(self, obj)
-
-
-def dumps(data):
- return JSONEncoder().encode(data)
-
-
-def loads(str):
- return json.loads(str, encoding=settings.DEFAULT_CHARSET)
-
-
-class JSONFormField(forms.CharField):
- widget = forms.Textarea
-
- def clean(self, value):
- try:
- loads(value)
- return value
- except ValueError, e:
- raise forms.ValidationError(_('Enter a valid JSON value. Error: %s') % e)
-
-
-class JSONField(models.TextField):
- def formfield(self, **kwargs):
- defaults = {'form_class': JSONFormField}
- defaults.update(kwargs)
- return super(JSONField, self).formfield(**defaults)
-
- def db_type(self):
- return 'text'
+from django.db.models.fields.files import FieldFile
- def get_internal_type(self):
- return 'TextField'
- def contribute_to_class(self, cls, name):
- super(JSONField, self).contribute_to_class(cls, name)
-
- def get_value(model_instance):
- return loads(getattr(model_instance, self.attname, None))
- setattr(cls, 'get_%s_value' % self.name, get_value)
+class OverwritingFieldFile(FieldFile):
+ """
+ Deletes the old file before saving the new one.
+ """
- def set_value(model_instance, json):
- return setattr(model_instance, self.attname, dumps(json))
- setattr(cls, 'set_%s_value' % self.name, set_value)
+ 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)
-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 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)
-
- 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 OverwritingFileField(models.FileField):
+ attr_class = OverwritingFieldFile
-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([], ["^catalogue\.fields\.OverwritingFileField"])
+except ImportError:
+ pass