Fix: Entry.__unicode__ could return None.

[django-migdal.git] / migdal / models.py

diff --git a/migdal/models.py b/migdal/models.py
index 3ab375d..75529d6 100644 (file)
--- a/migdal/models.py
+++ b/migdal/models.py
@@ -14,7 +14,7 @@ from django.template import loader, Context
 from django.utils.translation import get_language, ugettext_lazy as _, ugettext
 from django_comments_xtd.models import XtdComment
 from markupfield.fields import MarkupField
-from fnpdjango.utils.models.translation import add_translatable
+from fnpdjango.utils.models.translation import add_translatable, tQ
 from migdal import app_settings
 from migdal.fields import SlugNullField
 
@@ -27,7 +27,7 @@ class Category(models.Model):
         verbose_name_plural = _('categories')
 
     def __unicode__(self):
-        return self.title
+        return self.title or u""
 
     @models.permalink
     def get_absolute_url(self):
@@ -40,6 +40,12 @@ add_translatable(Category, {
 })
 
 
+class PublishedEntryManager(models.Manager):
+    def get_query_set(self):
+        return super(PublishedEntryManager, self).get_query_set().filter(
+                tQ(published=True)
+            )
+
 class Entry(models.Model):
     type = models.CharField(max_length=16,
             choices=((t.db, t.slug) for t in app_settings.TYPES),
@@ -54,6 +60,10 @@ class Entry(models.Model):
     in_stream = models.BooleanField(_('in stream'), default=True)
     categories = models.ManyToManyField(Category, null=True, blank=True, verbose_name=_('categories'))
     first_published_at = models.DateTimeField(_('published at'), null=True, blank=True)
+    canonical_url = models.URLField(_('canonical link'), null = True, blank = True)
+
+    objects = models.Manager()
+    published_objects = PublishedEntryManager()
 
     class Meta:
         verbose_name = _('entry')