diff --git a/src/backoffice/locale/de/LC_MESSAGES/django.po b/src/backoffice/locale/de/LC_MESSAGES/django.po index ba2a6a567bf4b8427d3606f58faf428672eaa520..532e7582398f28e2fbaedb351cfa0d75ec22dc6a 100644 --- a/src/backoffice/locale/de/LC_MESSAGES/django.po +++ b/src/backoffice/locale/de/LC_MESSAGES/django.po @@ -956,6 +956,12 @@ msgstr "Konferenz-Daten" msgid "Conference__submit" msgstr "Konferenz speichern" +msgid "AssemblyTeam__from_email" +msgstr "Assembly Team Absender E-Mail" + +msgid "AssemblyTeam__reply_to_email" +msgstr "Assembly Team Reply-To E-Mail" + msgid "Conferences__selection__header" msgstr "Konferenz auswählen" diff --git a/src/backoffice/locale/en/LC_MESSAGES/django.po b/src/backoffice/locale/en/LC_MESSAGES/django.po index 548a9e42fceb6bd65ff2af8ca2269be114e55aed..792b67f1a7783620396f3ca4cc4764ee8b0559ae 100644 --- a/src/backoffice/locale/en/LC_MESSAGES/django.po +++ b/src/backoffice/locale/en/LC_MESSAGES/django.po @@ -954,6 +954,12 @@ msgstr "conference data" msgid "Conference__submit" msgstr "Recall conference" +msgid "AssemblyTeam__from_email" +msgstr "assembly team from email address" + +msgid "AssemblyTeam__reply_to_email" +msgstr "assembly team reply to email address" + msgid "Conferences__selection__header" msgstr "Select Conference" @@ -2138,5 +2144,8 @@ msgstr "sessions" msgid "wa_textures" msgstr "textures" +#~ msgid "assemblyedit_message" +#~ msgstr "send a message to the assembly's organizing staff" + #~ msgid "All" #~ msgstr "all" diff --git a/src/backoffice/templates/backoffice/conferences/registration_edit.html b/src/backoffice/templates/backoffice/conferences/registration_edit.html index 9b3c5aa49164246697b123f2c418bc40b85b79e2..5ff8dd8b6c0f7afc8b82400aaca578a868878128 100644 --- a/src/backoffice/templates/backoffice/conferences/registration_edit.html +++ b/src/backoffice/templates/backoffice/conferences/registration_edit.html @@ -71,6 +71,12 @@ <div class="col-md-6">{% bootstrap_field form.registration_start %}</div> <div class="col-md-6">{% bootstrap_field form.registration_deadline %}</div> </div> + <div class="row mb-3"> + <label for="from_email" class="col-md-2">{% trans "AssemblyTeam__from_email" %}</label> + <span class="col-md-4">{{ assembly_team_from_email }}</span> + <label for="from_email" class="col-md-2">{% trans "AssemblyTeam__reply_to_email" %}</label> + <span class="col-md-4">{{ assembly_team_reply_to }}</span> + </div> <div class="row mb-3"> <div class="col-md-12">{% bootstrap_field form.additional_fields_schema %}</div> </div> diff --git a/src/backoffice/views/conferences.py b/src/backoffice/views/conferences.py index 66515ce995aae3295dbf5504333b2989b32992b9..e44ef89750702e6d1e53113665a40ff697da8b93 100644 --- a/src/backoffice/views/conferences.py +++ b/src/backoffice/views/conferences.py @@ -1,6 +1,7 @@ import logging from typing import Any +from django.conf import settings from django.contrib import messages from django.core.exceptions import PermissionDenied from django.forms.forms import BaseForm @@ -196,3 +197,10 @@ class ConferenceRegistrationView(ConferenceFormMixin, UpdateView): def get_success_url(self): return reverse('backoffice:conference-registration', kwargs={'pk': self.object.pk}) + + def get_context_data(self, *args, **kwargs): + return { + **super().get_context_data(*args, **kwargs), + 'assembly_team_from_email': settings.ASSEMBLY_TEAM_FROM_EMAIL, + 'assembly_team_reply_to': ', '.join(settings.ASSEMBLY_TEAM_REPLY_TO), + }