Skip to content

Commit 445a1e0

Browse files
committed
[#3076] page title change with cms page title
1 parent 788a90a commit 445a1e0

File tree

5 files changed

+29
-7
lines changed

5 files changed

+29
-7
lines changed

src/open_inwoner/accounts/views/contactmoments.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from django.views import View
1212
from django.views.generic import TemplateView
1313

14+
from cms.models.pagemodel import Page
1415
from requests import RequestException
1516
from view_breadcrumbs import BaseBreadcrumbMixin
1617

@@ -136,7 +137,19 @@ def crumbs(self):
136137
return [(_("Mijn vragen"), reverse("cases:contactmoment_list"))]
137138

138139
def page_title(self):
139-
return _("Mijn vragen")
140+
141+
# The filtering here is obviously pretty strange, but otherwise it seems
142+
# nigh impossible to pin down the 'Mijn Vragen' page. Any better
143+
# solution is appreciated.
144+
page = Page.objects.filter(
145+
application_urls="", publisher_is_draft=True, is_home=False
146+
).first()
147+
148+
# Extra check to be safe
149+
if page and page.get_absolute_url() == "/mijn-vragen/":
150+
return page.get_title()
151+
else:
152+
return _("Mijn Vragen")
140153

141154
def get_anchors(self) -> list:
142155
return [

src/open_inwoner/plans/views.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ class PlanListView(
9999

100100
@cached_property
101101
def crumbs(self):
102+
current_page = self.request.current_page
103+
title = current_page.get_title() if current_page else _("Samenwerken")
102104
return [
103-
(_("Samenwerken"), reverse("collaborate:plan_list")),
105+
(title, reverse("collaborate:plan_list")),
104106
]
105107

106108
def get_queryset(self):

src/open_inwoner/ssd/views.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,30 @@
66
from django.shortcuts import redirect
77
from django.urls import reverse
88
from django.utils.functional import cached_property
9-
from django.utils.translation import gettext as _
109
from django.views.generic.edit import FormView
1110

1211
from furl import furl
1312
from view_breadcrumbs import BaseBreadcrumbMixin
1413

14+
from open_inwoner.utils.views import CommonPageMixin
15+
1516
from .client import JaaropgaveClient, UitkeringClient
1617
from .forms import MonthlyReportsForm, YearlyReportsForm
1718

1819

19-
class BenefitsFormView(LoginRequiredMixin, BaseBreadcrumbMixin, FormView):
20+
class BenefitsFormView(
21+
LoginRequiredMixin, BaseBreadcrumbMixin, CommonPageMixin, FormView
22+
):
2023
template_name: str
2124
form_class: forms.Form
2225

2326
@cached_property
2427
def crumbs(self):
25-
return [(_("Mijn uitkeringen"), reverse("ssd:uitkeringen"))]
28+
current_page = self.request.current_page
29+
title = current_page.get_title() if current_page else ("Mijn uitkeringen")
30+
return [
31+
(title, reverse("ssd:uitkeringen")),
32+
]
2633

2734
def post(self, request, *args, **kwargs):
2835
form = self.get_form()

src/open_inwoner/templates/pages/plans/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{% block content %}
99
<header class="oip-header-group">
1010
<h1 class="utrecht-heading-1">
11-
{% trans "Samenwerken" %}
11+
{{ page_title }}
1212
</h1>
1313
{% button href="collaborate:plan_create" text=_("Start nieuwe samenwerking") primary=True icon="group" icon_outlined=True %}
1414
</header>

src/open_inwoner/templates/pages/ssd/reports_base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% render_grid %}
66
{% render_column span=9 %}
77
<h1 class="utrecht-heading-1" id="title">
8-
{% trans "Mijn uitkeringen" %}
8+
{{ page_title }}
99
</h1>
1010
<p>
1111
{% blocktrans with mijn_uitkeringen_text=client.config.mijn_uitkeringen_text|ckeditor_content|safe %}

0 commit comments

Comments
 (0)