Skip to content

Commit 6f2679c

Browse files
committed
refactor: rename URL parameter and template context for clarity
now the URL parameter is more descriptive, it is the district number, and the template context refers to the currently selected district
1 parent 5cb85e2 commit 6f2679c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

pems/districts/templates/districts/district.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "districts/index.html" %}
22

33
{% block headline %}
4-
District {{ district.number }} - {{ district.name }}
4+
District {{ current_district.number }} - {{ current_district.name }}
55
{% endblock headline %}
66

77
{% block districts-content %}
@@ -15,7 +15,7 @@ <h2>Chart</h2>
1515
</div>
1616
<div class="row">
1717
<div class="col-lg-4 border">
18-
<h2>Details for {{ district.name }}</h2>
18+
<h2>Details for {{ current_district.name }}</h2>
1919
</div>
2020
<div class="col-lg-8 border">
2121
<h2>Map</h2>

pems/districts/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
urlpatterns = [
1111
# /districts
1212
path("", views.IndexView.as_view(), name="index"),
13-
path("<int:district>", views.DistrictView.as_view(), name="district"),
13+
path("<int:district_number>", views.DistrictView.as_view(), name="district"),
1414
]

pems/districts/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class IndexView(DistrictContextMixin, TemplateView):
1919

2020
class DistrictView(DistrictContextMixin, DetailView):
2121
model = District
22-
context_object_name = "district"
22+
context_object_name = "current_district"
2323
template_name = "districts/district.html"
2424

2525
def get_object(self):
26-
return District.objects.get(number__iexact=self.kwargs["district"])
26+
return District.objects.get(number__iexact=self.kwargs["district_number"])

tests/pytest/pems/districts/test_views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ def test_template_name(self, view):
2626

2727
@pytest.mark.django_db
2828
def test_district_view(client, model_District):
29-
url = reverse("districts:district", kwargs={"district": 1})
29+
url = reverse("districts:district", kwargs={"district_number": model_District.number})
3030
response = client.get(url)
3131

3232
assert response.status_code == 200
33-
assert response.context["district"] == model_District
33+
assert response.context["current_district"] == model_District

0 commit comments

Comments
 (0)