X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/3c8f423203be690dd0bda32e90eec49f1650e4c6..4ad54bc9a9429a2c5c288192c663f75ae1e7aad9:/sommitrealweird/bpcms/models.py diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py index f28fede..6493902 100644 --- a/sommitrealweird/bpcms/models.py +++ b/sommitrealweird/bpcms/models.py @@ -22,7 +22,7 @@ class CSSDocument(models.Model): class Document(models.Model): title = models.CharField(max_length=150) - islive = models.BooleanField() + islive = models.BooleanField(default=False) extracss = models.ManyToManyField(CSSDocument, null=True, blank=True) folder = models.ForeignKey('Folder', null=True, blank=True) format = models.CharField(max_length=10, choices=FORMAT_CHOICES) @@ -36,7 +36,7 @@ class Document(models.Model): return self.__unicode__() def __unicode__(self): - return u'%s (%s)' %(self.title, self.get_folder_path()) + return u'%s - %s' %(self.get_basic_url(), self.title) def save(self): super(Document, self).save() @@ -66,14 +66,14 @@ class Document(models.Model): def get_absolute_url(self): if self.slug == 'index': if self.folder.parent: - return reverse('bpcms.views.document_view', kwargs={'folders': self.folder.parent.get_path(), 'slug': self.folder.slug}) + return reverse('bpcms-document-view', kwargs={'folders': self.folder.parent.get_path(), 'slug': self.folder.slug}) else: - return reverse('bpcms.views.document_view', kwargs={'slug': self.folder.slug}) + return reverse('bpcms-document-view', kwargs={'slug': self.folder.slug}) else: if self.folder: - return reverse('bpcms.views.document_view', kwargs={'folders': self.get_folder_path(), 'slug': self.slug}) + return reverse('bpcms-document-view', kwargs={'folders': self.get_folder_path(), 'slug': self.slug}) else: - return reverse('bpcms.views.document_view', kwargs={'slug': self.slug}) + return reverse('bpcms-document-view', kwargs={'slug': self.slug}) class Folder(models.Model): title = models.CharField(max_length=150) @@ -106,6 +106,6 @@ class Folder(models.Model): def get_absolute_url(self): if self.parent: - return reverse('bpcms.views.document_view', kwargs={'folders': self.parent.get_path(), 'slug': self.slug}) + return reverse('bpcms-document-view', kwargs={'folders': self.parent.get_path(), 'slug': self.slug}) else: - return reverse('bpcms.views.document_view', kwargs={'slug': self.slug}) + return reverse('bpcms-document-view', kwargs={'slug': self.slug})