From aa9161fb49800d3c89c1891deaaf3f0914189a04 Mon Sep 17 00:00:00 2001
From: Grollicus <cccvgitlab.db5c7b60@grollmann.eu>
Date: Thu, 26 Dec 2024 18:24:47 +0100
Subject: [PATCH] don't display speakerprofile uuid in the speaker header
---
src/plainui/jinja2/plainui/user.html.j2 | 2 +-
src/plainui/locale/de/LC_MESSAGES/django.po | 3 +++
src/plainui/locale/en/LC_MESSAGES/django.po | 3 +++
src/plainui/views/users.py | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/plainui/jinja2/plainui/user.html.j2 b/src/plainui/jinja2/plainui/user.html.j2
index 32c954191..fdf9f232c 100644
--- a/src/plainui/jinja2/plainui/user.html.j2
+++ b/src/plainui/jinja2/plainui/user.html.j2
@@ -14,7 +14,7 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("User Profile %(username)s", username=display_user.username) ) }}
+ {{ navMacro.top_nav(_("Speaker Profile") if is_speaker_user else _("User Profile %(username)s", username=display_user.username) ) }}
<div class="hub-vlayout">
<div class="hub-row">
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index adcb3ec55..1e6a92023 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -1099,6 +1099,9 @@ msgstr "Kommende Events"
msgid "%(conf)s - User %(name)s"
msgstr ""
+msgid "Speaker Profile"
+msgstr "Speakerprofil"
+
#, python-format
msgid "User Profile %(username)s"
msgstr "Profil: %(username)s"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 445ff7ae1..d89561435 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -1099,6 +1099,9 @@ msgstr ""
msgid "%(conf)s - User %(name)s"
msgstr ""
+msgid "Speaker Profile"
+msgstr "Speaker Profile"
+
#, python-format
msgid "User Profile %(username)s"
msgstr "User Profile %(username)s"
diff --git a/src/plainui/views/users.py b/src/plainui/views/users.py
index a040f4b48..d3a37999a 100644
--- a/src/plainui/views/users.py
+++ b/src/plainui/views/users.py
@@ -33,6 +33,8 @@ class UserView(ConferenceRequiredMixin, TemplateView):
context = super().get_context_data(**kwargs)
context['conf'] = self.conf
context['display_user'] = display_user = get_object_or_404(PlatformUser.objects.filter(slug=user_slug))
+ # is_speaker_user = usre was auto generated to display speaker details. They've got technical usernames, so we shouldn't display them.
+ context['is_speaker_user'] = display_user.user_type == PlatformUser.Type.SPEAKER
# TODO: Update after deciding oh one or more conferences in #648
conference_member = display_user.conferences.filter(conference=self.conf).first()
context['description_html'] = None if not conference_member else conference_member.description_html
--
GitLab