diff --git a/management/forms.py b/management/forms.py index 69125cf..cdbf30c 100644 --- a/management/forms.py +++ b/management/forms.py @@ -56,7 +56,7 @@ class GroupForm(forms.ModelForm): class RefereeLevelForm(forms.ModelForm): class Meta: model = RefereeLevel - fields = ["name", "ordering", "teams", "inherits_from"] + fields = ["name", "teams", "inherits_from"] widgets = {"teams": forms.SelectMultiple(attrs={"data-searchable": "true", "data-search-placeholder": _("Type a team to search...")})} def __init__(self, *args, club=None, **kwargs): diff --git a/management/templates/management/referee_level_list.html b/management/templates/management/referee_level_list.html index be62dc3..b78c04c 100644 --- a/management/templates/management/referee_level_list.html +++ b/management/templates/management/referee_level_list.html @@ -15,7 +15,6 @@ - @@ -25,7 +24,6 @@ {% for level in levels %} - {% empty %} - + {% endfor %} diff --git a/management/tests.py b/management/tests.py index 87e69b1..b3f89ec 100644 --- a/management/tests.py +++ b/management/tests.py @@ -1288,14 +1288,14 @@ class RefereeLevelManagementTests(ManagementTestBase): def test_create_is_admin_only(self): self.client.force_login(self.make_non_admin_coach()) - response = self.club_post("referee_level_create", {"name": "Regional", "ordering": 0, "teams": []}) + response = self.club_post("referee_level_create", {"name": "Regional", "teams": []}) self.assertEqual(response.status_code, 403) def test_admin_can_create_a_level_with_teams(self): self.client.force_login(self.admin_user) - response = self.club_post("referee_level_create", {"name": "Regional", "ordering": 0, "teams": [str(self.team.pk), str(self.other_team.pk)]}) + response = self.club_post("referee_level_create", {"name": "Regional", "teams": [str(self.team.pk), str(self.other_team.pk)]}) level = RefereeLevel.objects.get(club=self.club, name="Regional") self.assertRedirects(response, reverse("management:referee_level_list")) @@ -1306,7 +1306,7 @@ class RefereeLevelManagementTests(ManagementTestBase): level.teams.add(self.team) self.client.force_login(self.admin_user) - self.club_post("referee_level_update", {"name": "Regional", "ordering": 0, "teams": [str(self.other_team.pk)]}, level.pk) + self.club_post("referee_level_update", {"name": "Regional", "teams": [str(self.other_team.pk)]}, level.pk) self.assertEqual(set(level.teams.all()), {self.other_team}) @@ -1324,7 +1324,7 @@ class RefereeLevelManagementTests(ManagementTestBase): regional.teams.add(self.team) self.client.force_login(self.admin_user) - response = self.club_post("referee_level_create", {"name": "National", "ordering": 0, "teams": [str(self.other_team.pk)], "inherits_from": str(regional.pk)}) + response = self.club_post("referee_level_create", {"name": "National", "teams": [str(self.other_team.pk)], "inherits_from": str(regional.pk)}) national = RefereeLevel.objects.get(club=self.club, name="National") self.assertRedirects(response, reverse("management:referee_level_list")) @@ -1335,7 +1335,7 @@ class RefereeLevelManagementTests(ManagementTestBase): level = RefereeLevel.objects.create(club=self.club, name="Regional") self.client.force_login(self.admin_user) - self.club_post("referee_level_update", {"name": "Regional", "ordering": 0, "teams": [], "inherits_from": str(level.pk)}, level.pk) + self.club_post("referee_level_update", {"name": "Regional", "teams": [], "inherits_from": str(level.pk)}, level.pk) level.refresh_from_db() self.assertIsNone(level.inherits_from) diff --git a/teams/admin.py b/teams/admin.py index 92e041d..d173a70 100644 --- a/teams/admin.py +++ b/teams/admin.py @@ -72,11 +72,11 @@ class StaffAssignmentAdmin(admin.ModelAdmin): @admin.register(RefereeLevel) class RefereeLevelAdmin(admin.ModelAdmin): - list_display = ["name", "club", "ordering", "inherits_from", "team_list"] + list_display = ["name", "club", "inherits_from", "team_list"] list_filter = ["club"] search_fields = ["name"] autocomplete_fields = ["teams", "inherits_from"] - ordering = ["club", "ordering", "name"] + ordering = ["club", "name"] @admin.display(description=_("teams")) def team_list(self, obj): diff --git a/teams/migrations/0012_alter_refereelevel_options_and_more.py b/teams/migrations/0012_alter_refereelevel_options_and_more.py new file mode 100644 index 0000000..92b28d8 --- /dev/null +++ b/teams/migrations/0012_alter_refereelevel_options_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 6.0.6 on 2026-08-20 21:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0011_refereelevel_inherits_from'), + ] + + operations = [ + migrations.AlterModelOptions( + name='refereelevel', + options={'ordering': ['name'], 'verbose_name': 'referee level', 'verbose_name_plural': 'referee levels'}, + ), + migrations.RemoveField( + model_name='refereelevel', + name='ordering', + ), + ] diff --git a/teams/models.py b/teams/models.py index 54ca91a..e1feb7d 100644 --- a/teams/models.py +++ b/teams/models.py @@ -121,22 +121,23 @@ class TeamMembership(UUIDModel): class RefereeLevel(ClubScopedModel): """A club-defined referee qualification tier (e.g. "Regional", "National") - -- admin-managed, like Position, so a club can name and reorder its own - levels rather than picking from a fixed list. Owns which teams it - qualifies a referee for: eligibility is a property of the *level*, not of - the individual referee -- a club typically has a handful of levels, each - unlocking a tier of teams/competitions, rather than hand-picking teams per - referee. + -- admin-managed, like Position, so a club can name its own levels rather + than picking from a fixed list. Owns which teams it qualifies a referee + for: eligibility is a property of the *level*, not of the individual + referee -- a club typically has a handful of levels, each unlocking a + tier of teams/competitions, rather than hand-picking teams per referee. `inherits_from` chains levels together so a higher tier doesn't need every lower tier's team re-added by hand: a "National" referee is automatically eligible for everything "Regional" (its inherits_from) covers, and so on down the chain -- see eligible_team_ids, the single definition every consumer (RefereeProfile.eligible_teams, events.services.referees) reads - through.""" + through. That chain is also what expresses which tier is "higher" now -- + there used to be a manual `ordering` field for this too, dropped once + inherits_from covered the same need without a second, independently-kept + number to keep in sync with it.""" name = models.CharField(_("name"), max_length=255) - ordering = models.PositiveSmallIntegerField(_("ordering"), default=0, help_text=_("Lower numbers are listed first. Levels with the same number are ordered by name.")) teams = models.ManyToManyField(Team, related_name="referee_levels", blank=True, verbose_name=_("qualifies for"), help_text=_("Members holding this level can be assigned to referee these teams' home games.")) inherits_from = models.ForeignKey( "self", @@ -151,7 +152,7 @@ class RefereeLevel(ClubScopedModel): class Meta: verbose_name = _("referee level") verbose_name_plural = _("referee levels") - ordering = ["ordering", "name"] + ordering = ["name"] constraints = [ models.UniqueConstraint(fields=["club", "name"], name="unique_referee_level_name_per_club"), ]
{% trans "Ordering" %} {% trans "Name" %} {% trans "Inherits from" %} {% trans "Qualifies for" %}
{{ level.ordering }} {{ level.name }} {% if level.inherits_from %} @@ -52,7 +50,7 @@
{% trans "No referee levels yet." %}{% trans "No referee levels yet." %}