add caching to the toplevel menu

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

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

-from bpcms.content_val import is_unique_name
+from bpcms.content_val import is_allowed_name

 from django.conf import settings
 
 FORMAT_CHOICES = (
 from django.conf import settings
 
 FORMAT_CHOICES = (


@@ -12,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",))
+    slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_allowed_name,])

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


@@ -52,7 +52,7 @@ class Document(models.Model):
 
 class Folder(models.Model):
     title = models.CharField(maxlength=150)
 
 class Folder(models.Model):
     title = models.CharField(maxlength=150)

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

     parent = models.ForeignKey('self', null=True, blank=True)
 
     def __str__(self):
     parent = models.ForeignKey('self', null=True, blank=True)
 
     def __str__(self):