X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/8e218bdb4f1958b28ce249511e5acdb63eeb326b..bf5eb312070092ce660e85f271db579fc3d1edf9:/sommitrealweird/bpcms/context_processors.py diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py index 768d481..a78976d 100644 --- a/sommitrealweird/bpcms/context_processors.py +++ b/sommitrealweird/bpcms/context_processors.py @@ -45,58 +45,66 @@ def content_submenu(request): 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 + menu_items = cache.get('bpcms_contentmenu_%s' %(folderpath)) - # 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: + if not menu_items: + folder = None + folderpath = folderpath.split('/') + for part in folderpath: try: - items = Document.objects.filter(folder__exact=folder, \ - islive__exact=True, slug__exact='index') - for item in items: + 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': folder.get_basic_url(), + '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())) - menu_items.sort( \ - cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower())) + cache.set('bpcms_contentmenu_%s' %(folderpath), menu_items) return { 'content_submenu': menu_items, } def content_breadcrumb(request): - breadcrumb = [{'url': settings.BPCMS_ROOT, 'title': settings.BPCMS_ROOT},] + if settings.BPCMS_ROOT == "/": + breadcrumb = [{'url': settings.BPCMS_ROOT, 'title': "Home"}] + else: + breadcrumb = [{'url': settings.BPCMS_ROOT, 'title': settings.BPCMS_ROOT},] # find where we are in the tree first folderpath = request.path folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath)