X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/50f508dcc8a7c42ad481213b727b8f92ed50e1bb..f109b7f6e35d54281f1edf4b684c49db621d36c5:/apps/catalogue/fields.py?ds=inline
diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 2c0c76503..048824498 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -3,18 +3,19 @@
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
import datetime
+from functools import wraps
from django.conf import settings
from django.db import models
+from django.db.models.fields.files import FieldFile
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 south.modelsinspector import add_introspection_rules
class JSONEncoder(json.JSONEncoder):
@@ -38,7 +39,7 @@ def loads(str):
class JSONFormField(forms.CharField):
widget = forms.Textarea
-
+
def clean(self, value):
try:
loads(value)
@@ -53,7 +54,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):
@@ -61,7 +62,7 @@ class JSONField(models.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)
@@ -70,8 +71,6 @@ 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 JQueryAutoCompleteWidget(forms.TextInput):
def __init__(self, source, options=None, *args, **kwargs):
@@ -80,23 +79,23 @@ class JQueryAutoCompleteWidget(forms.TextInput):
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'''
@@ -104,7 +103,7 @@ class JQueryAutoCompleteWidget(forms.TextInput):
'attrs' : flatatt(final_attrs),
'js' : self.render_js(final_attrs['id']),
}
-
+
return mark_safe(html)
@@ -112,6 +111,34 @@ 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)
+
+class OverwritingFieldFile(FieldFile):
+ """
+ Deletes the old file before saving the new one.
+ """
+
+ 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 OverwritingFileField(models.FileField):
+ attr_class = OverwritingFieldFile
+
+
+try:
+ # check for south
+ from south.modelsinspector import add_introspection_rules
+
+ add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
+ add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])
+except ImportError:
+ pass