search in confirmation and contact admins

[edumed.git] / contact / models.py

diff --git a/contact/models.py b/contact/models.py
index 6b33d29..e7a2c4a 100644 (file)
--- a/contact/models.py
+++ b/contact/models.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-import yaml
-from django.core.files.storage import FileSystemStorage
 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
@@ -17,11 +16,11 @@ class Contact(models.Model):
     @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:
-                value = value.replace(" ", unichr(160))
+                from django.utils.encoding import smart_unicode
+                value = smart_unicode(value).replace(u" ", unichr(160))
         return value
 
     class Meta:
@@ -40,7 +39,7 @@ class Attachment(models.Model):
 
     @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)