fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workshop banner
[edumed.git]
/
contact
/
models.py
diff --git
a/contact/models.py
b/contact/models.py
index
6b33d29
..
8d89c8d
100644
(file)
--- a/
contact/models.py
+++ b/
contact/models.py
@@
-1,7
+1,8
@@
# -*- coding: utf-8 -*-
import yaml
# -*- coding: utf-8 -*-
import yaml
-from
django.core.files.storage import FileSystemStorage
+from
hashlib import sha1
from django.db import models
from django.db import models
+from django.utils.encoding import smart_unicode
from django.utils.translation import ugettext_lazy as _
from jsonfield import JSONField
from . import app_settings
from django.utils.translation import ugettext_lazy as _
from jsonfield import JSONField
from . import app_settings
@@
-17,11
+18,9
@@
class Contact(models.Model):
@staticmethod
def pretty_print(value, for_html=False):
if type(value) in (tuple, list, dict):
@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)
+ value = yaml.safe_dump(value, allow_unicode=True, default_flow_style=False)
if for_html:
if for_html:
- value =
value.replace(
" ", unichr(160))
+ value =
smart_unicode(value).replace(u
" ", unichr(160))
return value
class Meta:
return value
class Meta:
@@
-32,6
+31,11
@@
class Contact(models.Model):
def __unicode__(self):
return unicode(self.created_at)
def __unicode__(self):
return unicode(self.created_at)
+ def digest(self):
+ serialized_body = ';'.join(sorted('%s:%s' % item for item in self.body.iteritems()))
+ data = '%s%s%s%s%s' % (self.id, self.contact, serialized_body, self.ip, self.form_tag)
+ return sha1(data).hexdigest()
+
class Attachment(models.Model):
contact = models.ForeignKey(Contact)
class Attachment(models.Model):
contact = models.ForeignKey(Contact)
@@
-40,7
+44,7
@@
class Attachment(models.Model):
@models.permalink
def get_absolute_url(self):
@models.permalink
def get_absolute_url(self):
- return
('contact_attachment', [self.contact_id, self.tag])
+ return
'contact_attachment', [self.contact_id, self.tag]
__import__(app_settings.FORMS_MODULE)
__import__(app_settings.FORMS_MODULE)