From 66e84bbddc80e7f3ac04da6433a70da7da97698b Mon Sep 17 00:00:00 2001 From: Brett Parker Date: Sun, 3 Feb 2008 13:01:48 +0000 Subject: [PATCH] Add basic submenu support --- sommitrealweird/bpcms/context_processors.py | 62 ++++++++++++++++++++- sommitrealweird/bpcms/models.py | 7 ++- sommitrealweird/settings.py | 8 +++ templates/base.html | 13 ++++- 4 files changed, 84 insertions(+), 6 deletions(-) diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py index 90b98cc..b464307 100644 --- a/sommitrealweird/bpcms/context_processors.py +++ b/sommitrealweird/bpcms/context_processors.py @@ -1,5 +1,6 @@ from bpcms.models import Document, Folder -import operator +from django.conf import settings +import re def content_menu(request): items = Document.objects.filter(folder__isnull=True, islive__exact=True) @@ -26,8 +27,65 @@ def content_menu(request): except: pass - menu_items.sort(cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower())) + menu_items.sort( \ + cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower())) return { 'content_menu': menu_items, } + +def content_submenu(request): + # find where we are in the tree first + folderpath = request.path + folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath) + # right - that should be any prefix got rid of, now traverse the tree till + # we've got something + folder = None + folderpath = folderpath.split('/') + for part in folderpath: + try: + if folder: + f = Folder.objects.get(parent__exact=folder, slug__exact=part) + else: + f = Folder.objects.get(parent__isnull=True, slug__exact=part) + folder = f + except: + break + + # We have the folder (in theory) + menu_items = [] + if folder: + items = Document.objects.filter(folder__exact=folder, \ + islive__exact=True) + for item in items: + if item.slug != 'index': + menu_items.append( + { + 'title': item.title, + 'url': item.get_basic_url(), + } + ) + try: + folders = Folder.objects.filter(parent__exact=folder) + except: + pass + for folder in folders: + try: + items = Document.objects.filter(folder__exact=folder, \ + islive__exact=True, slug__exact='index') + for item in items: + menu_items.append( + { + 'title': item.title, + 'url': folder.get_basic_url(), + } + ) + except: + pass + + menu_items.sort( \ + cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower())) + + return { + 'content_submenu': menu_items, + } diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py index f538421..70d398a 100644 --- 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.conf import settings 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) - slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_unique_name,]) + slug = models.SlugField(prepopulate_from=("title",)) content = models.TextField() def __str__(self): @@ -44,7 +45,7 @@ class Document(models.Model): 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 @@ -72,7 +73,7 @@ class Folder(models.Model): if folderstring != u'': folderstring = "%s/" %(folderstring,) - return "%s" %(folderstring) + return "%s%s" %(settings.BPCMS_ROOT, folderstring) class Admin: pass diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py index aadcaa2..d363f2f 100644 --- a/sommitrealweird/settings.py +++ b/sommitrealweird/settings.py @@ -91,4 +91,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.i18n', 'generic.context_processors.media', 'bpcms.context_processors.content_menu', + 'bpcms.context_processors.content_submenu', +) + +BPCMS_ROOT = '/' +BPCMS_DISALLOWED_ROOT_DOC_NAMES = ( + 'admin', + 'blog', + 'photos', ) diff --git a/templates/base.html b/templates/base.html index 384e601..06cc632 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,7 +16,7 @@