show shortname of groups

yverdon · Aug 28, 2023 · b2636ad · b2636ad
1 parent 0ced1f6
commit b2636ad
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/geocity/apps/accounts/admin.py b/geocity/apps/accounts/admin.py
@@ -317,6 +317,7 @@ class DepartmentAdminForm(forms.ModelForm):
     class Meta:
         model = models.PermitDepartment
         fields = [
+            "shortname",
             "description",
             "administrative_entity",
             "is_validator",

diff --git a/geocity/apps/accounts/migrations/0015_alter_permitdepartment_shortname.py b/geocity/apps/accounts/migrations/0015_alter_permitdepartment_shortname.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.4 on 2023-08-28 12:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0014_alter_administrativeentity_is_single_form_submissions"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="permitdepartment",
+            name="shortname",
+            field=models.CharField(
+                blank=True,
+                help_text="Nom affiché par défaut dans les différentes étapes du formulaire, ne s'affiche pas dans l'admin (max. 100 caractères)",
+                max_length=100,
+                verbose_name="nom court",
+            ),
+        ),
+    ]
diff --git a/geocity/apps/accounts/models.py b/geocity/apps/accounts/models.py
@@ -119,9 +119,9 @@ class PermitDepartment(models.Model):
     description = models.CharField(_("description"), max_length=100, default="Service")
     shortname = models.CharField(
         _("nom court"),
-        max_length=32,
+        max_length=100,
         help_text=_(
-            "Nom affiché par défaut dans les différentes étapes du formulaire, ne s'affiche pas dans l'admin (max. 32 caractères)"
+            "Nom affiché par défaut dans les différentes étapes du formulaire, ne s'affiche pas dans l'admin (max. 100 caractères)"
         ),
         blank=True,
     )
@@ -202,7 +202,7 @@ class Meta:
         )
 
     def __str__(self):
-        return str(self.group)
+        return self.shortname if self.shortname else self.group.name
 
 
 class AdministrativeEntityQuerySet(models.QuerySet):

diff --git a/geocity/apps/forms/migrations/0024_form_slug_and_contactformforadminsite.py b/geocity/apps/forms/migrations/0024_form_slug_and_contactformforadminsite.py
@@ -64,4 +64,22 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.RunPython(generate_uuids),
+        migrations.AlterField(
+            model_name="form",
+            name="quick_access_slug",
+            field=models.UUIDField(
+                blank=True,
+                default=uuid.uuid4,
+                help_text="Permettant d'accéder directement au formulaire par l'url: https://geocity.ch/?form=demande-macaron",
+                unique=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        re.compile("^[-a-zA-Z0-9_]+\\Z"),
+                        "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens.",
+                        "invalid",
+                    )
+                ],
+                verbose_name="URL courte",
+            ),
+        ),
     ]
diff --git a/geocity/apps/submissions/templates/submissions/submission_detail.html b/geocity/apps/submissions/templates/submissions/submission_detail.html
@@ -188,7 +188,7 @@ <h2>{% translate "Validation" %}</h2>
           {% for validation in validations %}
             <div class="container">
               <dl>
-                <dt> {{ validation.department.group.name }} </dt>
+                <dt> {{ validation.department }} </dt>
                 <dd{% if validation.is_pending %} class="text-muted"{% endif %}>
                   {% if 'Approuvé' in validation.get_validation_status_display %}
                     <i class="fa fa-check-circle" aria-hidden="true"></i>&#x202F;