add data processing confirmation to CooperateForm

[edumed.git] / contact / models.py

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

-from django.core.files.storage import FileSystemStorage

 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 +17,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:


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