Skip to content

Commit 011db36

Browse files
committed
Refactor form validation handling in query_table and query_chart functions to ensure ctx is always initialized
1 parent 552a519 commit 011db36

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

events/templates/events/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
<div class="nav">
6363
{% for topic, links in settings.DELVE_NAV_MENU.items %}
6464
<li class="mb-1">
65-
<button class="btn btn-toggle align-items-center rounded collapsed text-{% if user.profile.mode == 'dark' %}light{% else %}dark{% endif %}" data-bs-toggle="collapse" data-bs-target="#{{ topic }}-collapse" aria-expanded="true">
65+
<button class="btn btn-toggle align-items-center rounded collapsed text-{% if user.profile.mode == 'dark' %}light{% else %}dark{% endif %}" data-bs-toggle="collapse" data-bs-target="#{{ topic|slugify }}-collapse" aria-expanded="true">
6666
{{ topic | upper }}
6767
</button>
6868
<div class="container">
69-
<div class="collapse" id="{{ topic }}-collapse">
69+
<div class="collapse" id="{{ topic|slugify }}-collapse">
7070
<ul class="btn-toggle-nav list-unstyled pb-1 small">
7171
{% for text, name in links.items %}
7272
<li><a href="{% url name %}" class="rounded text-{% if user.profile.mode == 'dark' %}light{% else %}dark{% endif %}">{{ text }}</a></li>

events/templatetags/query.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ def query_table(context, query_string, form=None, **kwargs):
2020
if form and form.is_valid():
2121
log.debug(f"Form is valid: {form.cleaned_data}")
2222
ctx = form.cleaned_data
23-
else:
23+
elif form:
2424
log.debug(f"Form is not valid: {form.errors}")
2525
ctx = {}
26+
else:
27+
ctx = {}
2628
if kwargs:
2729
log.debug(f"kwargs: {kwargs}")
2830
ctx.update(kwargs)
@@ -46,9 +48,11 @@ def query_chart(context, query_string, form=None, **kwargs):
4648
if form and form.is_valid():
4749
log.debug(f"Form is valid: {form.cleaned_data}")
4850
ctx = form.cleaned_data
49-
else:
51+
elif form:
5052
log.debug(f"Form is not valid: {form.errors}")
5153
ctx = {}
54+
else:
55+
ctx = {}
5256
if kwargs:
5357
log.debug(f"kwargs: {kwargs}")
5458
ctx.update(kwargs)

0 commit comments

Comments
 (0)