onetoonefield in usercard & migrations

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

diff --git a/apps/organizations/models.py b/apps/organizations/models.py
index 0761b66..c236da4 100644 (file)
--- a/apps/organizations/models.py
+++ b/apps/organizations/models.py
@@ -83,14 +83,14 @@ 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 AssertionError:
+        except (AssertionError, AttributeError):

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

-    user = models.ForeignKey(User, unique=True, primary_key=True)
+    user = models.OneToOneField(User, primary_key=True)

 
     def __str__(self):
         return str(self.user)
 
     def __str__(self):
         return str(self.user)


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

-    tags = models.ManyToManyField('catalogue.Tag')
+    tags = models.ManyToManyField('catalogue.Tag', blank=True)

     # logo = models.ImageField(upload_to='people/logo', blank=True)
     # country = models.CharField(max_length=64, blank=True, choices=countries)
     # www = models.URLField(blank=True)
     # logo = models.ImageField(upload_to='people/logo', blank=True)
     # country = models.CharField(max_length=64, blank=True, choices=countries)
     # www = models.URLField(blank=True)