Fixed #805 -- implemented option 2 for Enschede

maykinmedia · Sep 20, 2022 · 98c6ce7 · 98c6ce7
1 parent 6e3b4b7
commit 98c6ce7
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/src/open_inwoner/components/templates/components/Header/Header.html b/src/open_inwoner/components/templates/components/Header/Header.html
@@ -15,8 +15,7 @@
                 <nav class="header__actions" aria-label="Zoek navigatie mobiel">
                     <div class="header__text-actions">
                         <p class="p">
-                            {% trans "Welkom" %}
-                            {% if request.user %}{{ request.user.get_full_name }}{% endif %}
+                            {% if request.user.is_authenticated %}{% trans "Welkom" %} {{ request.user.get_full_name }}{% endif %}
                         </p>
 
                         {% if request.user.is_authenticated %}
@@ -26,7 +25,7 @@
                                     {% link text=logout href=request.user.get_logout_url primary=True %}
                                 </li>
                             </ul>
-                        {% else %}
+                        {% elif config.login_show %}
                             <ul class="header__list">
                                 <li class="header__list-item">
                                     {% url 'login' as login_url %}
@@ -51,8 +50,7 @@
         <nav class="header__actions" aria-label="Zoek navigatie desktop">
             <div class="header__text-actions">
                 <p class="p">
-                    {% trans "Welkom" %}
-                    {% if request.user %}{{ request.user.get_full_name }}{% endif %}
+                    {% if request.user.is_authenticated %}{% trans "Welkom" %} {{ request.user.get_full_name }}{% endif %}
                 </p>
 
                 {% if request.user.is_authenticated %}
@@ -62,7 +60,7 @@
                             {% link text=logout href=request.user.get_logout_url primary=True %}
                         </li>
                     </ul>
-                {% else %}
+                {% elif config.login_show %}
                     <ul class="header__list">
                         <li class="header__list-item">
                             {% url 'login' as login_url %}

diff --git a/src/open_inwoner/configurations/admin.py b/src/open_inwoner/configurations/admin.py
@@ -36,6 +36,7 @@ class SiteConfigurarionAdmin(OrderedInlineModelAdminMixin, SingletonModelAdmin):
             {
                 "fields": (
                     "name",
+                    "login_show",
                     "login_allow_registration",
                     "show_cases",
                     "show_product_finder",

diff --git a/src/open_inwoner/configurations/migrations/0020_siteconfiguration_login_show.py b/src/open_inwoner/configurations/migrations/0020_siteconfiguration_login_show.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.13 on 2022-09-20 18:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("configurations", "0019_auto_20220704_1002"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="login_show",
+            field=models.BooleanField(
+                default=True,
+                help_text="Wanneer deze optie uit staat dan kan nog wel worden ingelogd via /accounts/login/ , echter het inloggen is verborgen",
+                verbose_name="Toon inlogknop rechts bovenin",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/configurations/models.py b/src/open_inwoner/configurations/models.py
@@ -68,6 +68,13 @@ class SiteConfiguration(SingletonModel):
         related_name="hero_image_login",
         help_text=_("Hero image on the login page"),
     )
+    login_show = models.BooleanField(
+        verbose_name=_("Toon inlogknop rechts bovenin"),
+        default=True,
+        help_text=_(
+            "Wanneer deze optie uit staat dan kan nog wel worden ingelogd via /accounts/login/ , echter het inloggen is verborgen"
+        ),
+    )
     login_allow_registration = models.BooleanField(
         verbose_name=_("Sta lokale registratie toe"),
         default=False,