Make footer slightly nicer.

[sommitrealweird.git] / sommitrealweird / bpcms / models.py

diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py
index f538421613dd453f43f6dd038a6663f9edca7978..70d398a60b188da440ec8f7fb3b6bedf34d61340 100644 (file)
--- a/sommitrealweird/bpcms/models.py
+++ b/sommitrealweird/bpcms/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from bpcms.content_val import is_unique_name
 from django.db import models
 from bpcms.content_val import is_unique_name

+from django.conf import settings

 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),
 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),


@@ -11,7 +12,7 @@ class Document(models.Model):
     islive = models.BooleanField()
     folder = models.ForeignKey('Folder', null=True, blank=True)
     format = models.CharField(maxlength=10, choices=FORMAT_CHOICES)
     islive = models.BooleanField()
     folder = models.ForeignKey('Folder', null=True, blank=True)
     format = models.CharField(maxlength=10, choices=FORMAT_CHOICES)

-    slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_unique_name,])
+    slug = models.SlugField(prepopulate_from=("title",))

     content = models.TextField()
 
     def __str__(self):
     content = models.TextField()
 
     def __str__(self):


@@ -44,7 +45,7 @@ class Document(models.Model):
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 

-        return "%s%s/" %(folderstring, self.slug)
+        return "%s%s%s/" %(settings.BPCMS_ROOT, folderstring, self.slug)

 
     class Admin:
         pass
 
     class Admin:
         pass


@@ -72,7 +73,7 @@ class Folder(models.Model):
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 

-        return "%s" %(folderstring)
+        return "%s%s" %(settings.BPCMS_ROOT, folderstring)

 
     class Admin:
         pass
 
     class Admin:
         pass