From 23798e729a945236561a6eb9dcc737e68ef187f7 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Wed, 28 Jul 2021 17:26:33 +0200
Subject: [PATCH] manager: add and uniformize page titles (#55838)

---
 src/authentic2/manager/role_views.py                            | 1 +
 .../manager/templates/authentic2/manager/journal.html           | 2 +-
 .../manager/templates/authentic2/manager/role_common.html       | 2 ++
 .../manager/templates/authentic2/manager/role_edit.html         | 2 +-
 .../manager/templates/authentic2/manager/role_permissions.html  | 2 ++
 .../manager/templates/authentic2/manager/service.html           | 2 ++
 .../manager/templates/authentic2/manager/user_common_roles.html | 2 ++
 .../manager/templates/authentic2/manager/user_detail.html       | 2 ++
 .../manager/templates/authentic2/manager/user_edit.html         | 2 ++
 src/authentic2/manager/user_views.py                            | 1 +
 10 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/authentic2/manager/role_views.py b/src/authentic2/manager/role_views.py
index 286b7d0d..5eecb17f 100644
--- a/src/authentic2/manager/role_views.py
+++ b/src/authentic2/manager/role_views.py
@@ -748,6 +748,7 @@ class RoleJournal(views.PermissionMixin, JournalViewWithContext, BaseJournalView
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['object'] = self.context
+        ctx['object_name'] = str(self.context)
         return ctx
 
 
diff --git a/src/authentic2/manager/templates/authentic2/manager/journal.html b/src/authentic2/manager/templates/authentic2/manager/journal.html
index b2194f38..d2b740ae 100644
--- a/src/authentic2/manager/templates/authentic2/manager/journal.html
+++ b/src/authentic2/manager/templates/authentic2/manager/journal.html
@@ -1,7 +1,7 @@
 {% extends "authentic2/manager/base.html" %}
 {% load i18n gadjo %}
 
-{% block page-title %}{{ block.super }} - {% trans "Journal" %}{% endblock %}
+{% block page-title %}{{ block.super }}{% if object_name %} - {{ object_name }}{% endif %} - {% trans "Journal" %}{% endblock %}
 
 {% block breadcrumb %}
   {{ block.super }}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_common.html b/src/authentic2/manager/templates/authentic2/manager/role_common.html
index 7fb36c65..c6c02ae1 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_common.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_common.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/base.html" %}
 {% load i18n static %}
 
+{% block page-title %}{{ block.super }}{% if object %} - {{ object }}{% endif %}{% endblock %}
+
 {% block title %}{{ block.super }} - {% trans "Roles" %}{% endblock %}
 
 {% block breadcrumb %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_edit.html b/src/authentic2/manager/templates/authentic2/manager/role_edit.html
index 656ba8cf..09fb3008 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_edit.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_edit.html
@@ -1,7 +1,7 @@
 {% extends "authentic2/manager/role_common.html" %}
 {% load i18n gadjo %}
 
-{% block page-title %}{{ block.super }} - {% trans "Edit role" %} {{ object }}{% endblock %}
+{% block page-title %}{{ block.super }} - {% trans "Edit" %}{% endblock %}
 
 {% block breadcrumb %}
   {{ block.super }}
diff --git a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
index b01f2033..9398e5da 100644
--- a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
+++ b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/role_common.html" %}
 {% load i18n static django_tables2 %}
 
+{% block page-title %}{{ block.super }} - {% trans "Permissions" %}{% endblock %}
+
 {% block breadcrumb %}
   {{ block.super }}
   <a href="..">{{ object }}</a>
diff --git a/src/authentic2/manager/templates/authentic2/manager/service.html b/src/authentic2/manager/templates/authentic2/manager/service.html
index a8a66d10..2481c970 100644
--- a/src/authentic2/manager/templates/authentic2/manager/service.html
+++ b/src/authentic2/manager/templates/authentic2/manager/service.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/services.html" %}
 {% load i18n static django_tables2 %}
 
+{% block page-title %}{% firstof manager_site_title site_title "Authentic2" %} - {{ object }}{% endblock %}
+
 {% block breadcrumb %}
   {{ block.super }}
   <a href="{% url 'a2-manager-service' service_pk=view.kwargs.service_pk %}">{{ view.service.name }}</a>
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html b/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html
index dc0d7bd3..361b35d0 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/base.html" %}
 {% load i18n %}
 
+{% block page-title %}{{ block.super }} - {{ object.get_full_name }} - {% trans "Edit roles" %}{% endblock %}
+
 {% block breadcrumb %}
   {{ block.super }}
   <a href="{% url 'a2-manager-users' %}">{% trans 'Users' %}</a>
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
index 530b452c..08e9a4e6 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/form.html" %}
 {% load i18n static %}
 
+{% block page-title %}{{ block.super }} - {{ object.get_full_name }}{% endblock %}
+
 {% block appbar %}
   {{ block.super }}
   <span class="actions">
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_edit.html b/src/authentic2/manager/templates/authentic2/manager/user_edit.html
index 25f54890..2f1f06d1 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_edit.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_edit.html
@@ -1,6 +1,8 @@
 {% extends "authentic2/manager/form.html" %}
 {% load i18n %}
 
+{% block page-title %}{{ block.super }} - {{ object.get_full_name }} - {% trans "Edit" %}{% endblock %}
+
 {% block breadcrumb %}
   {{ block.super }}
   <a href="{% url 'a2-manager-users' %}{% if multiple_ou and object.ou %}?search-ou={{ object.ou.pk }}{% endif %}">{% trans 'Users' %}{% if multiple_ou and object.ou %}&nbsp;: {{ object.ou }}{% endif %}</a>
diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py
index c5f3a03f..4a6d0972 100644
--- a/src/authentic2/manager/user_views.py
+++ b/src/authentic2/manager/user_views.py
@@ -996,6 +996,7 @@ class UserJournal(PermissionMixin, JournalViewWithContext, BaseJournalView):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['object'] = self.context
+        ctx['object_name'] = self.context.get_full_name()
         return ctx
 
 
-- 
2.20.1