ungleich-public/public-health-ch
6
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
PCoder 2024-07-19 19:56:32 +05:30
parent 822fca63c3
commit 87332a9f05
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
publichealth/home/templatetags/navigation.py
View file

@ -91,7 +91,6 @@ def menuitems_children(parent, context=None):
request = context['request'] request = context['request']
site = Site.find_for_request(request) site = Site.find_for_request(request)
if site.hostname in ['sphc.ch', 'public-health.ch']: if site.hostname in ['sphc.ch', 'public-health.ch']:
print("site is %s, add terms and conditions to footer" % site.hostname)
# custom page here is the terms and conditions page for public-health.ch and sphc.ch (common) # custom page here is the terms and conditions page for public-health.ch and sphc.ch (common)
if request.__dict__.get('LANGUAGE_CODE', 'de').lower() == 'en': if request.__dict__.get('LANGUAGE_CODE', 'de').lower() == 'en':
custom_page_id = 1020 custom_page_id = 1020
@ -99,11 +98,7 @@ def menuitems_children(parent, context=None):
custom_page_id = 994 custom_page_id = 994
custom_page = Page.objects.get(id=custom_page_id) custom_page = Page.objects.get(id=custom_page_id)
menuitems_children = list(menuitems_children) menuitems_children = list(menuitems_children)
if custom_page not in menuitems_children:
#menuitems_children.append(custom_page)
print("custom_page == ")
page_ids = [page.id for page in menuitems_children] page_ids = [page.id for page in menuitems_children]
print("hostname is %s" % site.hostname)
menuitems_children = Page.objects.filter(id__in=page_ids).specific() menuitems_children = Page.objects.filter(id__in=page_ids).specific()
for menuitem in menuitems_children: for menuitem in menuitems_children:
try: try:
@ -117,15 +112,12 @@ def menuitems_children(parent, context=None):
def add_item_to_page_queryset(queryset, custom_page): def add_item_to_page_queryset(queryset, custom_page):
# Convert queryset to a list # Convert queryset to a list
pages_list = list(queryset) pages_list = list(queryset)
# Add the custom page to the list # Add the custom page to the list
pages_list.append(custom_page) pages_list.append(custom_page)
# Create a new ordered queryset based on the list order # Create a new ordered queryset based on the list order
page_ids = [page.id for page in pages_list] page_ids = [page.id for page in pages_list]
preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)]) preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)])
new_queryset = Page.objects.filter(id__in=page_ids).order_by(preserved_order).specific() new_queryset = Page.objects.filter(id__in=page_ids).order_by(preserved_order).specific()
return new_queryset return new_queryset