Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't accept result values with . #2303

Merged
merged 1 commit into from
May 15, 2024
Merged

Don't accept result values with . #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ynr/apps/uk_results/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.db.models.functions import Coalesce
from uk_results.helpers import RecordBallotResultsHelper
from utils.db import LastWord, NullIfBlank
from utils.widgets import DCNumberInput
from utils.widgets import DCIntegerInput

from .models import CandidateResult, ResultSet

Expand All @@ -33,10 +33,10 @@ class Meta:
"columns": 72,
}
),
"num_turnout_reported": DCNumberInput(),
"turnout_percentage": DCNumberInput(),
"num_spoilt_ballots": DCNumberInput(),
"total_electorate": DCNumberInput(),
"num_turnout_reported": DCIntegerInput(),
"turnout_percentage": DCIntegerInput(),
"num_spoilt_ballots": DCIntegerInput(),
"total_electorate": DCIntegerInput(),
}

def __init__(self, ballot, *args, **kwargs):
Expand Down Expand Up @@ -80,7 +80,7 @@ def __init__(self, ballot, *args, **kwargs):
label=membership.name_and_party,
initial=initial.get("num_ballots"),
required=True,
widget=DCNumberInput,
widget=DCIntegerInput,
)
fields[f"tied_vote_{name}"] = forms.BooleanField(
required=False,
Expand Down
2 changes: 1 addition & 1 deletion ynr/apps/uk_results/tests/test_smoke_test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_form_view_creates_result(self):
resp = self.app.get(url, user=self.user_who_can_record_results)
self.assertEqual(resp.status_code, 200)
self.assertContains(resp, 'inputmode="numeric"')
self.assertContains(resp, r'pattern="[0-9\s\.,]*"')
self.assertContains(resp, r'pattern="[0-9\s,]*"')
form = resp.forms[1]
form["memberships_13"] = 1000
form["memberships_14"] = 2000
Expand Down
4 changes: 2 additions & 2 deletions ynr/apps/utils/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def create_option(
return option


class DCNumberInput(TextInput):
class DCIntegerInput(TextInput):
"""
An input widget for entering numbers that isn't an input `type=number`.

Expand All @@ -43,7 +43,7 @@ def build_attrs(self, base_attrs, extra_attrs=None):
attrs.update(
{
"inputmode": "numeric",
"pattern": r"[0-9\s\.,]*",
"pattern": r"[0-9\s,]*",
"oninvalid": "this.setCustomValidity('Enter a number')",
}
)
Expand Down
Loading