From c71c78cf69a51c79f203a71c81d5afdf1ca56a81 Mon Sep 17 00:00:00 2001
From: Richard Schreiber <wiffbi@gmail.com>
Date: Fri, 27 Nov 2020 16:08:34 +0100
Subject: [PATCH] Added Person-Name-Scheme for showing/entering academic degree
 after the name (e.g. <Name>, MA) (#1861)

---
 src/pretix/base/settings.py                   | 24 +++++++++++++++++++
 .../static/pretixcontrol/scss/_forms.scss     |  2 +-
 .../static/pretixpresale/scss/_forms.scss     |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 3f30ce84d..6bd232fab 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -2052,6 +2052,30 @@ PERSON_NAME_SCHEMES = OrderedDict([
             '_scheme': 'salutation_title_given_family',
         },
     }),
+    ('salutation_title_given_family_degree', {
+        'fields': (
+            ('salutation', pgettext_lazy('person_name', 'Salutation'), 1),
+            ('title', pgettext_lazy('person_name', 'Title'), 1),
+            ('given_name', _('Given name'), 2),
+            ('family_name', _('Family name'), 2),
+            ('degree', pgettext_lazy('person_name', 'Degree (after name)'), 2),
+        ),
+        'concatenation': lambda d: (
+            ' '.join(
+                str(p) for p in (d.get(key, '') for key in ["title", "given_name", "family_name"]) if p
+            ) +
+            str((', ' if d.get('degree') else '')) +
+            str(d.get('degree', ''))
+        ),
+        'sample': {
+            'salutation': pgettext_lazy('person_name_sample', 'Mr'),
+            'title': pgettext_lazy('person_name_sample', 'Dr'),
+            'given_name': pgettext_lazy('person_name_sample', 'John'),
+            'family_name': pgettext_lazy('person_name_sample', 'Doe'),
+            'degree': pgettext_lazy('person_name_sample', 'MA'),
+            '_scheme': 'salutation_title_given_family_degree',
+        },
+    }),
 ])
 COUNTRIES_WITH_STATE_IN_ADDRESS = {
     # Source: http://www.bitboost.com/ref/international-address-formats.html
diff --git a/src/pretix/static/pretixcontrol/scss/_forms.scss b/src/pretix/static/pretixcontrol/scss/_forms.scss
index 742815abb..5f2d71537 100644
--- a/src/pretix/static/pretixcontrol/scss/_forms.scss
+++ b/src/pretix/static/pretixcontrol/scss/_forms.scss
@@ -512,7 +512,7 @@ table td > .checkbox input[type="checkbox"] {
     display: flex;
     flex-direction: row;
     input, select {
-      width: auto;
+      min-width: 5em;
       flex-basis: 0;
       flex-grow: 1;
     }
diff --git a/src/pretix/static/pretixpresale/scss/_forms.scss b/src/pretix/static/pretixpresale/scss/_forms.scss
index 52afe098a..e151d184f 100644
--- a/src/pretix/static/pretixpresale/scss/_forms.scss
+++ b/src/pretix/static/pretixpresale/scss/_forms.scss
@@ -116,7 +116,7 @@ a.btn, button.btn {
     display: flex;
     flex-direction: row;
     input, select {
-      width: auto;
+      min-width: 5em;
       flex-basis: 0;
       flex-grow: 1;
     }