projects
/
sommitrealweird.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes for django 2.2
[sommitrealweird.git]
/
sommitrealweird
/
bpcms
/
context_processors.py
diff --git
a/sommitrealweird/bpcms/context_processors.py
b/sommitrealweird/bpcms/context_processors.py
index 0edc30af4e26242bed1dd99e0cfbcedc980256c7..e92e8cef2db13b0bacd88139c687fa12c2ed2dd9 100644
(file)
--- a/
sommitrealweird/bpcms/context_processors.py
+++ b/
sommitrealweird/bpcms/context_processors.py
@@
-4,6
+4,7
@@
from django.core.cache import cache
import re
def content_menu(request):
import re
def content_menu(request):
+
menu_items = cache.get('bpcms_mainmenu')
if not menu_items:
menu_items = cache.get('bpcms_mainmenu')
if not menu_items:
@@
-14,7
+15,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,14
+26,14
@@
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:
pass
menu_items.sort( \
}
)
except:
pass
menu_items.sort( \
-
cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()
))
+
key=lambda x: x['title'].lower(
))
cache.set('bpcms_mainmenu', menu_items, 3600)
return {
cache.set('bpcms_mainmenu', menu_items, 3600)
return {
@@
-70,36
+71,35
@@
def content_submenu(request):
menu_items.append(
{
'title': item.title,
menu_items.append(
{
'title': item.title,
- 'url': item.get_
basic
_url(),
+ 'url': item.get_
absolute
_url(),
}
)
}
)
- try:
- folders = Folder.objects.filter(parent__exact=folder)
- except:
- pass
+ folders = Folder.objects.filter(parent__exact=folder)
for folder in folders:
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
+ 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_absolute_url(),
+ }
+ )
menu_items.sort( \
menu_items.sort( \
- cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
+ 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)
@@
-117,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
@@
-132,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