make sure that we 404 rather than 500 on people requesting pages that don't exist

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

diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py
index 768d481b3ebce7d030e79f5cd091b11d20fd3cb1..c235c9b31e39db17b27da878d49a7eabada45517 100644 (file)
--- a/sommitrealweird/bpcms/context_processors.py
+++ b/sommitrealweird/bpcms/context_processors.py
@@ -14,7 +14,7 @@ def content_menu(request):
                 menu_items.append(
                     {
                         'title': item.title,
                 menu_items.append(
                     {
                         'title': item.title,

-                        'url': item.get_basic_url(),
+                        'url': item.get_absolute_url(),

                     }
                 )
         folders = Folder.objects.filter(parent__isnull=True)
                     }
                 )
         folders = Folder.objects.filter(parent__isnull=True)


@@ -25,7 +25,7 @@ def content_menu(request):
                 menu_items.append(
                     {
                         'title': item.title,
                 menu_items.append(
                     {
                         'title': item.title,

-                        'url': folder.get_basic_url(),
+                        'url': folder.get_absolute_url(),

                     }
                 )
             except:
                     }
                 )
             except:


@@ -45,58 +45,60 @@ 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
     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:
             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_absolute_url(),
+                        }
+                    )
+            folders = Folder.objects.filter(parent__exact=folder)
+            for folder in folders:

                 items = Document.objects.filter(folder__exact=folder, \
                     islive__exact=True, slug__exact='index')
                 for item in items:
                     menu_items.append(
                         {
                             'title': item.title,
                 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(),
+                            'url': folder.get_absolute_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):
 
     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)
     # find where we are in the tree first
     folderpath = request.path
     folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath)


@@ -114,10 +116,10 @@ def content_breadcrumb(request):
             try:
                 item = Document.objects.get(folder__exact=folder,
                     slug__exact=u'index', islive__exact=True)
             try:
                 item = Document.objects.get(folder__exact=folder,
                     slug__exact=u'index', islive__exact=True)

-                breadcrumb.append({'url': folder.get_basic_url(),
+                breadcrumb.append({'url': folder.get_absolute_url(),

                     'title': item.title})
             except:
                     'title': item.title})
             except:

-                breadcrumb.append({'url': folder.get_basic_url(),
+                breadcrumb.append({'url': folder.get_absolute_url(),

                     'title': folder.title})
         except:
             # must have hit the end of the tree, lets see if we can get an
                     'title': folder.title})
         except:
             # must have hit the end of the tree, lets see if we can get an


@@ -129,7 +131,7 @@ def content_breadcrumb(request):
                 else:
                     item = Document.objects.get(folder__isnull=True, \
                         slug__exact=part, islive__exact=True)
                 else:
                     item = Document.objects.get(folder__isnull=True, \
                         slug__exact=part, islive__exact=True)

-                breadcrumb.append({'url': item.get_basic_url(), 'title': item.title})
+                breadcrumb.append({'url': item.get_absolute_url(), 'title': item.title})

             except:
                 pass
             break
             except:
                 pass
             break