change manager and add a pretty_title function

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index c561ce3b46a3199c23eaf63b52b098791e852b9e..ab05fdb88fe84144e7985133930d89c8084a550f 100755 (executable)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -58,6 +58,7 @@ from django.core.paginator import InvalidPage, EmptyPage
 from django.template.defaultfilters import slugify
 import tinymce.models
 from mezzanine.core.models import Displayable
+from mezzanine.core.managers import DisplayableManager
 from django.core.urlresolvers import reverse
 
 app_label = 'teleforma'
@@ -478,6 +479,8 @@ class Conference(Displayable):
                                         blank=True, null=True)
     notes = generic.GenericRelation(Note)
 
+    objects = DisplayableManager()
+    
     @property
     def slug_streaming(self):
         slug = '-'.join([self.course.department.slug,
@@ -541,6 +544,14 @@ class Conference(Displayable):
                                         'stream_type': stream.stream_type  })
         return data
 
+    @property
+    def pretty_title(self):
+        """
+        Get a displayable title
+        """
+        return "%s : %s" % (self.title, self.date_begin)
+
+
     def public_url(self):
         """
         Get a public fully qualified URL for the object

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
index 32c1030c46e506cb4a541af9d6367e092178aa27..99d5248be6b25cf2d7606fcda0833f8acb3b688b 100755 (executable)
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
@@ -42,7 +42,7 @@ from telemeta.models.core import *
 from teleforma.models.core import *
 from forms_builder.forms.models import Form
 from django.core.urlresolvers import reverse
-
+from mezzanine.core.managers import DisplayableManager
 
 class SeminarType(models.Model):
 
@@ -96,9 +96,21 @@ class Seminar(Displayable):
     date_added      = models.DateTimeField(_('date added'), auto_now_add=True)
     date_modified   = models.DateTimeField(_('date modified'), auto_now=True)
 
+    objects = DisplayableManager()
+
     def __unicode__(self):
         return ' - '.join([self.course.title, str(self.rank), self.title])
 
+    @property
+    def pretty_title(self):
+        """
+        Get a displayable title
+        """
+        if self.sub_title:
+            return "E-learning - %s : %s" % (self.sub_title, self.title)
+        else:
+            return "E-learning - %s" % (self.title)
+
     def public_url(self):
         """
         Get a public fully qualified URL for the object