Changeset 6 for bitstructures/trunk/substructure/models.py

Timestamp:

09/17/07 18:48:54 (16 months ago)

Author:

simon

Message:

Added viewing of drafts.
Added a list of drafts to the info-block.

Files:

• bitstructures/trunk/substructure/models.py (modified) (3 diffs)

bitstructures/trunk/substructure/models.py

@@ -7 +7 @@
     >>> test1.id = 1
     >>> test1.slug = 'testentry1'
-    >>> bool(test1.date)
+    >>> test1.is_published()
     False
-    >>> bool(test1.is_public)
-    False
+    >>> test1.is_draft()
+    True
     >>> test1.get_absolute_url()
-    '/testentry1'
+    '/drafts/testentry1'
     >>> test2 = Entry()
     >>> test2.id = 2
     >>> test2.slug = 'testentry2'
-    >>> test2.date = datetime(2001, 2, 3)
-    >>> bool(test2.date)
+    >>> test2.date_published = datetime(2001, 2, 3)
+    >>> test2.is_published()
     True
-    >>> bool(test2.is_public)
+    >>> test2.is_draft()
     False
     >>> test2.get_absolute_url()
@@ -27 +27 @@
     slug = models.SlugField(unique=True, blank=False)
     title = models.CharField(maxlength=200, blank=False)
-    date = models.DateTimeField(null=True, blank=True)
-    is_public = models.BooleanField()
+    date_published = models.DateTimeField(null=True, blank=True)
     text = models.TextField(blank=False)
 
@@ -34 +33 @@
         return self.title
 
+    def is_published(self):
+        return bool(self.date_published)
+
+    def is_draft(self):
+        return not self.is_published()
+
     def get_absolute_url(self):
-        if self.date:
-            year = self.date.year
-            month = self.date.month
+        if self.is_published():
+            year = self.date_published.year
+            month = self.date_published.month
             return '/%04d/%02d/%s' % (year, month, self.slug)
         else:
-            return '/%s' % (self.slug)
+            return '/drafts/%s' % (self.slug)
 
     class Admin:
         fields = (
-            (None, {'fields': ('title', 'slug', 'date', 'is_public')}),
+            (None, {'fields': ('title', 'slug', 'date_published')}),
             (None, {'fields': ('text',), 'classes': 'monospace'})
         )
-        list_display = ('title', 'slug', 'date', 'is_public', 'get_absolute_url')
-        ordering = ['-date']
+        list_display = ('title', 'get_absolute_url', 'date_published')
+        ordering = ['-date_published']