Fix photo ordering

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

diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py
index d57c7e90d4b36feefd7460cd73c3f59650dde3a3..e92e8cef2db13b0bacd88139c687fa12c2ed2dd9 100644 (file)
--- a/sommitrealweird/bpcms/context_processors.py
+++ b/sommitrealweird/bpcms/context_processors.py
@@ -1,34 +1,40 @@
 from bpcms.models import Document, Folder
 from django.conf import settings
 from bpcms.models import Document, Folder
 from django.conf import settings

+from django.core.cache import cache

 import re
 
 def content_menu(request):
 import re
 
 def content_menu(request):

-    items = Document.objects.filter(folder__isnull=True, islive__exact=True)
-    menu_items = []
-    for item in items:
-        if item.slug != 'index':
-            menu_items.append(
-                {
-                    'title': item.title,
-                    'url': item.get_basic_url(),
-                }
-            )
-    folders = Folder.objects.filter(parent__isnull=True)
-    for folder in folders:
-        try:
-            items = Document.objects.filter(folder__exact=folder, islive__exact=True, slug__exact='index')
-            item = items[0]
-            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 = cache.get('bpcms_mainmenu')
+
+    if not menu_items:
+        items = Document.objects.filter(folder__isnull=True, islive__exact=True)
+        menu_items = []
+        for item in items:
+            if item.slug != 'index':
+                menu_items.append(
+                    {
+                        'title': item.title,
+                        'url': item.get_absolute_url(),
+                    }
+                )
+        folders = Folder.objects.filter(parent__isnull=True)
+        for folder in folders:
+            try:
+                items = Document.objects.filter(folder__exact=folder, islive__exact=True, slug__exact='index')
+                item = items[0]
+                menu_items.append(
+                    {
+                        'title': item.title,
+                        'url': folder.get_absolute_url(),
+                    }
+                )
+            except:
+                pass
+
+        menu_items.sort( \
+            key=lambda x: x['title'].lower())
+        cache.set('bpcms_mainmenu', menu_items, 3600)

 
     return {
         'content_menu': menu_items,
 
     return {
         'content_menu': menu_items,


@@ -40,58 +46,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( \
+            key=lambda x: x['title'].lower())
+
+        cache.set('bpcms_contentmenu_%s' %("/".join(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)


@@ -109,10 +117,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


@@ -124,7 +132,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