update librarian

[redakcja.git] / apps / organizations / models.py

diff --git a/apps/organizations/models.py b/apps/organizations/models.py
index 1781d7d..6a7aa7a 100644 (file)
--- a/apps/organizations/models.py
+++ b/apps/organizations/models.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-

 from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse
 from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse


@@ -5,8 +6,7 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.template.loader import render_to_string
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.template.loader import render_to_string

-from django.utils import translation 
-#from jsonfield import JSONField
+from django.utils import translation

 
 
 countries = [
 
 
 countries = [


@@ -83,9 +83,10 @@ class Card(models.Model):
             p = getattr(self, "preview_html_%s" % lang)
             assert p
             return p
             p = getattr(self, "preview_html_%s" % lang)
             assert p
             return p

-        except:
+        except (AssertionError, AttributeError):

             return self.preview_html
 
             return self.preview_html
 

+

 @python_2_unicode_compatible
 class UserCard(Card):
     preview_html_template = 'organizations/snippets/user.html'
 @python_2_unicode_compatible
 class UserCard(Card):
     preview_html_template = 'organizations/snippets/user.html'


@@ -103,16 +104,17 @@ class Organization(Card):
     preview_html_template = 'organizations/snippets/organization.html'
 
     name = models.CharField(max_length=1024)
     preview_html_template = 'organizations/snippets/organization.html'
 
     name = models.CharField(max_length=1024)

-    #logo = models.ImageField(upload_to='people/logo', blank=True)
-    #country = models.CharField(max_length=64, blank=True, choices=countries)
-    #www = models.URLField(blank=True)
-    #description = models.TextField(blank=True, default="")
-    ##projects = JSONField(default=[])
-    #projects = models.TextField(blank=True, default="")
+    tags = models.ManyToManyField('catalogue.Tag')
+    # logo = models.ImageField(upload_to='people/logo', blank=True)
+    # country = models.CharField(max_length=64, blank=True, choices=countries)
+    # www = models.URLField(blank=True)
+    # description = models.TextField(blank=True, default="")
+    # #projects = JSONField(default=[])
+    # projects = models.TextField(blank=True, default="")

 
 

-    #preview_html = models.TextField(blank=True, default="")
+    # preview_html = models.TextField(blank=True, default="")

 
 

-    #created_at = models.DateTimeField(auto_now_add=True)
+    # created_at = models.DateTimeField(auto_now_add=True)

 
     def __str__(self):
         return self.name
 
     def __str__(self):
         return self.name