Small elections regressions

alexiri · alexiri · commit 27dcca63c03b · 2026-02-20T14:24:15.000+01:00
diff --git a/astra_app/core/static/core/js/form_validation_bootstrap44.js b/astra_app/core/static/core/js/form_validation_bootstrap44.js
@@ -76,12 +76,10 @@
     form.addEventListener(
       "submit",
       function (event) {
-        if (event.submitter && event.submitter.formNoValidate) {
-          return;
-        }
-
+        const allowInvalidSubmit =
+          event.submitter && event.submitter.dataset.allowInvalidSubmit === "true";
         const isValid = validateForm(form, "submit", event.target);
-        if (!isValid) {
+        if (!isValid && !allowInvalidSubmit) {
           event.preventDefault();
           event.stopPropagation();
         }
diff --git a/astra_app/core/templates/core/ballot_verify.html b/astra_app/core/templates/core/ballot_verify.html
@@ -127,7 +127,7 @@ <h5>Ballot Information</h5>
                 {% if verification_snippet %}
                   <h5>Copy/paste constants for local verification</h5>
                   <p class="text-muted">
-                    Copy/paste the block below into <strong>verify-ballot-hash.py</strong>. It includes the election ID,
+                    Copy/paste the block below into <strong><a href="{% static 'verify-ballot-hash.py' %}">verify-ballot-hash.py</a></strong>. It includes the election ID,
                     candidate username-to-ID mapping, and your credential public ID. You still need to enter your own vote choices
                     in the script (vote choices are secret and are not shown on this page).
                   </p>
diff --git a/astra_app/core/templates/core/election_detail.html b/astra_app/core/templates/core/election_detail.html
@@ -32,6 +32,10 @@
     .election-voter-card.collapsed-card .card-tools .js-card-search {
       display: none;
     }
+
+    .candidate-card-divider {
+      clear: both;
+    }
   </style>
 {% endblock %}
 
@@ -245,7 +249,7 @@ <h3 class="card-title mb-0">
                         </p>
                       {% endif %}
 
-                      <hr />
+                      <hr class="candidate-card-divider" />
                       <p class="mb-0">
                         <strong>Nominated by</strong>
                           —
diff --git a/astra_app/core/templates/core/election_edit.html b/astra_app/core/templates/core/election_edit.html
@@ -87,7 +87,7 @@ <h3 class="card-title mb-0">Election details</h3>
       <div class="col-lg-3">
         <div class="card card-outline card-secondary">
           <div class="card-body">
-            <button type="submit" class="btn btn-primary btn-block" onclick="document.getElementById('election-edit-action').value='save_draft'" title="Save changes as a draft">
+            <button type="submit" data-allow-invalid-submit="true" class="btn btn-primary btn-block" onclick="document.getElementById('election-edit-action').value='save_draft'" title="Save changes as a draft">
               Save Draft
             </button>
 
@@ -143,7 +143,7 @@ <h5 class="modal-title" id="start-election-modal-label">Start election?</h5>
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-outline-secondary" data-dismiss="modal" title="Close dialog without starting">Cancel</button>
-              <button type="submit" class="btn btn-success" onclick="document.getElementById('election-edit-action').value='start_election'" title="Start the election and send credentials">Start election &amp; send credentials</button>
+              <button type="submit" data-allow-invalid-submit="true" class="btn btn-success" onclick="document.getElementById('election-edit-action').value='start_election'" title="Start the election and send credentials">Start election &amp; send credentials</button>
             </div>
           </div>
         </div>
diff --git a/astra_app/core/tests/test_elections_edit_ui.py b/astra_app/core/tests/test_elections_edit_ui.py
@@ -161,6 +161,27 @@ def test_new_election_hides_start_button_until_saved(self) -> None:
         self.assertNotContains(resp, 'data-target="#start-election-modal"')
         self.assertNotContains(resp, 'id="start-election-modal"')
 
+    def test_new_election_save_draft_button_allows_invalid_submit_without_formnovalidate(self) -> None:
+        self._login_as_freeipa_user("admin")
+        FreeIPAPermissionGrant.objects.create(
+            principal_type=FreeIPAPermissionGrant.PrincipalType.user,
+            principal_name="admin",
+            permission=ASTRA_ADD_ELECTION,
+        )
+
+        resp = self.client.get(reverse("election-edit", args=[0]))
+        self.assertEqual(resp.status_code, 200)
+
+        html = resp.content.decode("utf-8")
+        self.assertRegex(
+            html,
+            r"<button[^>]*data-allow-invalid-submit=\"true\"[^>]*title=\"Save changes as a draft\"[^>]*>",
+        )
+        self.assertNotRegex(
+            html,
+            r"<button[^>]*formnovalidate[^>]*title=\"Save changes as a draft\"[^>]*>",
+        )
+
 
 class ElectionDraftDeletionTests(TestCase):
     def _login_as_freeipa_user(self, username: str) -> None:
@@ -249,7 +270,7 @@ def test_new_election_post_save_draft_creates_election(self) -> None:
         self.assertEqual(resp.status_code, 302)
         self.assertEqual(Election.objects.filter(name="New draft", status=Election.Status.draft).count(), 1)
 
-    def test_new_election_post_rejects_zero_seats(self) -> None:
+    def test_start_election_submit_button_allows_invalid_submit_for_server_validation(self) -> None:
         self._login_as_freeipa_user("admin")
         FreeIPAPermissionGrant.objects.create(
             principal_type=FreeIPAPermissionGrant.PrincipalType.user,
@@ -258,17 +279,91 @@ def test_new_election_post_rejects_zero_seats(self) -> None:
         )
 
         now = timezone.now()
+        election = Election.objects.create(
+            name="Draft election",
+            description="",
+            url="",
+            start_datetime=now + datetime.timedelta(days=10),
+            end_datetime=now + datetime.timedelta(days=11),
+            number_of_seats=1,
+            status=Election.Status.draft,
+        )
+
+        resp = self.client.get(reverse("election-edit", args=[election.id]))
+        self.assertEqual(resp.status_code, 200)
+        html = resp.content.decode("utf-8")
+        self.assertRegex(
+            html,
+            r"<button(?=[^>]*title=\"Start the election and send credentials\")(?=[^>]*data-allow-invalid-submit=\"true\")[^>]*>",
+        )
+        self.assertNotRegex(
+            html,
+            r"<button[^>]*title=\"Start the election and send credentials\"[^>]*formnovalidate[^>]*>",
+        )
+
+    def test_start_election_without_candidates_shows_specific_error_without_generic_duplicate(self) -> None:
+        self._login_as_freeipa_user("admin")
+        FreeIPAPermissionGrant.objects.create(
+            principal_type=FreeIPAPermissionGrant.PrincipalType.user,
+            principal_name="admin",
+            permission=ASTRA_ADD_ELECTION,
+        )
+
+        now = timezone.now()
+        election = Election.objects.create(
+            name="Draft election",
+            description="",
+            url="",
+            start_datetime=now + datetime.timedelta(days=10),
+            end_datetime=now + datetime.timedelta(days=11),
+            number_of_seats=1,
+            quorum=10,
+            status=Election.Status.draft,
+        )
+
+        resp = self.client.post(
+            reverse("election-edit", args=[election.id]),
+            data={
+                "action": "start_election",
+                "name": election.name,
+                "description": election.description,
+                "url": election.url,
+                "start_datetime": election.start_datetime.strftime("%Y-%m-%dT%H:%M"),
+                "end_datetime": election.end_datetime.strftime("%Y-%m-%dT%H:%M"),
+                "number_of_seats": str(election.number_of_seats),
+                "quorum": str(election.quorum),
+                "email_template_id": "",
+                "subject": "",
+                "html_content": "",
+                "text_content": "",
+            },
+            follow=False,
+        )
+
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, "Add at least one candidate before starting the election.")
+        self.assertNotContains(resp, "Please correct the errors below.")
+
+    def test_new_election_post_save_draft_with_only_name_creates_partial_election(self) -> None:
+        self._login_as_freeipa_user("admin")
+        FreeIPAPermissionGrant.objects.create(
+            principal_type=FreeIPAPermissionGrant.PrincipalType.user,
+            principal_name="admin",
+            permission=ASTRA_ADD_ELECTION,
+        )
+
         resp = self.client.post(
             reverse("election-edit", args=[0]),
             data={
                 "action": "save_draft",
-                "name": "Invalid draft",
+                "name": "Partial draft",
                 "description": "",
                 "url": "",
-                "start_datetime": (now + datetime.timedelta(days=10)).strftime("%Y-%m-%dT%H:%M"),
-                "end_datetime": (now + datetime.timedelta(days=11)).strftime("%Y-%m-%dT%H:%M"),
-                "number_of_seats": "0",
-                "quorum": "50",
+                "start_datetime": "",
+                "end_datetime": "",
+                "number_of_seats": "",
+                "quorum": "",
+                "eligible_group_cn": "",
                 "email_template_id": "",
                 "subject": "",
                 "html_content": "",
@@ -291,12 +386,78 @@ def test_new_election_post_rejects_zero_seats(self) -> None:
             follow=False,
         )
 
-        self.assertEqual(resp.status_code, 200)
-        self.assertContains(resp, "Number of seats")
-        self.assertContains(resp, "Ensure this value is greater than or equal to 1")
-        self.assertContains(resp, 'id="election-edit-form"')
-        self.assertContains(resp, "was-validated")
-        self.assertContains(resp, "invalid-feedback")
+        self.assertEqual(resp.status_code, 302)
+        election = Election.objects.get(name="Partial draft")
+        self.assertEqual(election.status, Election.Status.draft)
+        self.assertEqual(election.start_datetime, election.end_datetime)
+
+    def test_start_election_still_requires_required_fields_after_partial_draft_save(self) -> None:
+        self._login_as_freeipa_user("admin")
+        FreeIPAPermissionGrant.objects.create(
+            principal_type=FreeIPAPermissionGrant.PrincipalType.user,
+            principal_name="admin",
+            permission=ASTRA_ADD_ELECTION,
+        )
+
+        save_resp = self.client.post(
+            reverse("election-edit", args=[0]),
+            data={
+                "action": "save_draft",
+                "name": "Draft requiring completion",
+                "description": "",
+                "url": "",
+                "start_datetime": "",
+                "end_datetime": "",
+                "number_of_seats": "",
+                "quorum": "",
+                "eligible_group_cn": "",
+                "email_template_id": "",
+                "subject": "",
+                "html_content": "",
+                "text_content": "",
+                "candidates-TOTAL_FORMS": "1",
+                "candidates-INITIAL_FORMS": "0",
+                "candidates-MIN_NUM_FORMS": "0",
+                "candidates-MAX_NUM_FORMS": "1000",
+                "candidates-0-id": "",
+                "candidates-0-freeipa_username": "",
+                "candidates-0-nominated_by": "",
+                "candidates-0-description": "",
+                "candidates-0-url": "",
+                "candidates-0-DELETE": "",
+                "groups-TOTAL_FORMS": "0",
+                "groups-INITIAL_FORMS": "0",
+                "groups-MIN_NUM_FORMS": "0",
+                "groups-MAX_NUM_FORMS": "1000",
+            },
+            follow=False,
+        )
+        self.assertEqual(save_resp.status_code, 302)
+        election = Election.objects.get(name="Draft requiring completion")
+
+        start_resp = self.client.post(
+            reverse("election-edit", args=[election.id]),
+            data={
+                "action": "start_election",
+                "name": election.name,
+                "description": election.description,
+                "url": election.url,
+                "start_datetime": "",
+                "end_datetime": "",
+                "number_of_seats": "",
+                "quorum": "",
+                "email_template_id": "",
+                "subject": "",
+                "html_content": "",
+                "text_content": "",
+            },
+            follow=False,
+        )
+
+        self.assertEqual(start_resp.status_code, 200)
+        self.assertContains(start_resp, "Please correct the errors below.")
+        election.refresh_from_db()
+        self.assertEqual(election.status, Election.Status.draft)
 
     @override_settings(ELECTION_ELIGIBILITY_MIN_MEMBERSHIP_AGE_DAYS=1)
     def test_save_draft_rejects_self_nomination_and_does_not_save_candidate(self) -> None:
diff --git a/astra_app/core/tests/test_elections_ui.py b/astra_app/core/tests/test_elections_ui.py
@@ -150,3 +150,64 @@ def _get_user(username: str):
         self.assertContains(resp, "Nominated by")
         self.assertContains(resp, reverse("user-profile", args=["nominator"]))
         self.assertContains(resp, "Nominator Person")
+
+    def test_candidate_card_divider_clears_avatar_when_description_missing(self) -> None:
+        self._login_as_freeipa_user("viewer")
+
+        now = timezone.now()
+        election = Election.objects.create(
+            name="Board election",
+            description="",
+            start_datetime=now - datetime.timedelta(days=1),
+            end_datetime=now + datetime.timedelta(days=1),
+            number_of_seats=2,
+            status=Election.Status.open,
+        )
+
+        Candidate.objects.create(
+            election=election,
+            freeipa_username="adamnelson",
+            nominated_by="benjamingarcia",
+            description="",
+            url="",
+        )
+
+        viewer = FreeIPAUser("viewer", {"uid": ["viewer"], "memberof_group": []})
+        candidate_user = FreeIPAUser(
+            "adamnelson",
+            {
+                "uid": ["adamnelson"],
+                "givenname": ["Adam"],
+                "sn": ["Nelson"],
+                "displayname": ["Adam Nelson"],
+                "memberof_group": [],
+            },
+        )
+        nominator_user = FreeIPAUser(
+            "benjamingarcia",
+            {
+                "uid": ["benjamingarcia"],
+                "givenname": ["Benjamin"],
+                "sn": ["Garcia"],
+                "displayname": ["Benjamin Garcia"],
+                "memberof_group": [],
+            },
+        )
+
+        def _get_user(username: str):
+            if username == "viewer":
+                return viewer
+            if username == "adamnelson":
+                return candidate_user
+            if username == "benjamingarcia":
+                return nominator_user
+            return None
+
+        self.assertIsNotNone(election.pk)
+        with patch("core.backends.FreeIPAUser.get", side_effect=_get_user):
+            resp = self.client.get(reverse("election-detail", args=[election.pk]))
+
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, "class=\"candidate-card-divider\"")
+        self.assertContains(resp, ".candidate-card-divider")
+        self.assertContains(resp, "clear: both;")
diff --git a/astra_app/core/tests/test_plan093_realtime_form_validation_required_indicators.py b/astra_app/core/tests/test_plan093_realtime_form_validation_required_indicators.py
@@ -69,6 +69,8 @@ def test_realtime_validation_js_uses_touched_blur_and_invalid_only_states(self)
         self.assertIn('field.classList.toggle("is-invalid", !field.checkValidity())', script)
         self.assertIn('field.dataset.astraTouched === "1" || field.classList.contains("is-invalid")', script)
         self.assertNotIn('classList.add("is-valid")', script)
+        self.assertIn('event.submitter && event.submitter.dataset.allowInvalidSubmit === "true"', script)
+        self.assertIn("if (!isValid && !allowInvalidSubmit)", script)
 
     def test_base_css_displays_invalid_feedback_when_field_is_invalid_without_form_was_validated(self) -> None:
         css = self._read_core_static("css", "base.css")
diff --git a/astra_app/core/views_elections/edit.py b/astra_app/core/views_elections/edit.py
