Django 2.0

[wolnelektury.git] / src / contact / models.py

diff --git a/src/contact/models.py b/src/contact/models.py
index 0ab8201..b173b4d 100644 (file)
--- a/src/contact/models.py
+++ b/src/contact/models.py
@@ -1,10 +1,10 @@
-# -*- coding: utf-8 -*-
+import json

 import yaml
 from hashlib import sha1
 from django.db import models
 import yaml
 from hashlib import sha1
 from django.db import models

-from django.utils.encoding import smart_unicode
+from django.urls import reverse
+from django.utils.encoding import smart_text

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _

-from jsonfield import JSONField

 from . import app_settings
 
 
 from . import app_settings
 
 


@@ -13,14 +13,14 @@ class Contact(models.Model):
     ip = models.GenericIPAddressField(_('IP address'))
     contact = models.EmailField(_('contact'), max_length=128)
     form_tag = models.CharField(_('form'), max_length=32, db_index=True)
     ip = models.GenericIPAddressField(_('IP address'))
     contact = models.EmailField(_('contact'), max_length=128)
     form_tag = models.CharField(_('form'), max_length=32, db_index=True)

-    body = JSONField(_('body'))
+    body = models.TextField(_('body'))

 
     @staticmethod
     def pretty_print(value, for_html=False):
         if type(value) in (tuple, list, dict):
             value = yaml.safe_dump(value, allow_unicode=True, default_flow_style=False)
             if for_html:
 
     @staticmethod
     def pretty_print(value, for_html=False):
         if type(value) in (tuple, list, dict):
             value = yaml.safe_dump(value, allow_unicode=True, default_flow_style=False)
             if for_html:

-                value = smart_unicode(value).replace(u" ", unichr(160))
+                value = smart_text(value).replace(u" ", unichr(160))

         return value
 
     class Meta:
         return value
 
     class Meta:


@@ -28,11 +28,11 @@ class Contact(models.Model):
         verbose_name = _('submitted form')
         verbose_name_plural = _('submitted forms')
 
         verbose_name = _('submitted form')
         verbose_name_plural = _('submitted forms')
 

-    def __unicode__(self):
-        return unicode(self.created_at)
+    def __str__(self):
+        return str(self.created_at)

 
     def digest(self):
 
     def digest(self):

-        serialized_body = ';'.join(sorted('%s:%s' % item for item in self.body.iteritems()))
+        serialized_body = ';'.join(sorted('%s:%s' % item for item in self.get_body_json().items()))

         data = '%s%s%s%s%s' % (self.id, self.contact, serialized_body, self.ip, self.form_tag)
         return sha1(data).hexdigest()
 
         data = '%s%s%s%s%s' % (self.id, self.contact, serialized_body, self.ip, self.form_tag)
         return sha1(data).hexdigest()
 


@@ -45,17 +45,20 @@ class Contact(models.Model):
         return list(orig_fields.keys())
 
     def items(self):
         return list(orig_fields.keys())
 
     def items(self):

-        return [(key, self.body[key]) for key in self.keys() if key in self.body]
+        body = self.get_body_json()
+        return [(key, body[key]) for key in self.keys() if key in body]
+
+    def get_body_json(self):
+        return json.loads(self.body or '{}')

 
 
 class Attachment(models.Model):
 
 
 class Attachment(models.Model):

-    contact = models.ForeignKey(Contact)
+    contact = models.ForeignKey(Contact, models.CASCADE)

     tag = models.CharField(max_length=64)
     file = models.FileField(upload_to='contact/attachment')
 
     tag = models.CharField(max_length=64)
     file = models.FileField(upload_to='contact/attachment')
 

-    @models.permalink

     def get_absolute_url(self):
     def get_absolute_url(self):

-        return 'contact_attachment', [self.contact_id, self.tag]
+        return reverse('contact_attachment', args=[self.contact_id, self.tag])

 
 
 __import__(app_settings.FORMS_MODULE)
 
 
 __import__(app_settings.FORMS_MODULE)