update deadline

[edumed.git] / contact / models.py

diff --git a/contact/models.py b/contact/models.py
index 6b33d29..be16c4c 100644 (file)
--- a/contact/models.py
+++ b/contact/models.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-import yaml
-from django.core.files.storage import FileSystemStorage

 from django.db import models
 from django.db import models

+from django.db.models import permalink

 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 +16,11 @@ 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)
+            import yaml
+            value = yaml.safe_dump(value, allow_unicode=True, default_flow_style=False)

             if for_html:
             if for_html:

-                value = value.replace(" ", unichr(160))
+                from django.utils.encoding import smart_unicode
+                value = smart_unicode(value).replace(u" ", unichr(160))

         return value
 
     class Meta:
         return value
 
     class Meta:


@@ -32,6 +31,13 @@ class Contact(models.Model):
     def __unicode__(self):
         return unicode(self.created_at)
 
     def __unicode__(self):
         return unicode(self.created_at)
 

+    @permalink
+    def update_url(self):
+        from contact.forms import update_forms, contact_forms
+        form_class = update_forms.get(self.form_tag, contact_forms.get(self.form_tag))
+        confirmation = form_class.confirmation_class.objects.get(contact=self)
+        return 'edit_form', [], {'form_tag': self.form_tag, 'contact_id': self.id, 'key': confirmation.key}
+

 
 class Attachment(models.Model):
     contact = models.ForeignKey(Contact)
 
 class Attachment(models.Model):
     contact = models.ForeignKey(Contact)


@@ -40,7 +46,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)