Default for membership_type and unicode fix

anttihirvonen · Sep 14, 2012 · f34b9c9 · f34b9c9
1 parent df2184b
commit f34b9c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dotmembership/apps/billing/models.py b/dotmembership/apps/billing/models.py
@@ -48,7 +48,7 @@ def save(self, *args, **kwargs):
         super(Invoice, self).save(*args, **kwargs)
 
     def __unicode__(self):
-        return "{0}, {1}".format(self.member, self.for_year)
+        return u"{0}, {1}".format(self.member, self.for_year)
 
 reversion.register(Invoice)
 

diff --git a/dotmembership/apps/members/models.py b/dotmembership/apps/members/models.py
@@ -43,7 +43,7 @@ class Member(models.Model):
 
     # Membership data
     joined = models.DateTimeField(_(u"liittymisaika"), auto_now_add=True, editable=False)
-    membership_type = models.CharField(_(u"jäsentyyppi"), choices=MEMBERSHIP, max_length=15)
+    membership_type = models.CharField(_(u"jäsentyyppi"), choices=MEMBERSHIP, default=MEMBERSHIP.normal, max_length=15)
 
     @property
     def timestamped_id(self):