From 8283cfc44d355a85a5db5a67e471d1724148068b Mon Sep 17 00:00:00 2001 From: Trullemans Gregory Date: Fri, 12 Nov 2021 08:11:59 +0100 Subject: [PATCH] Fixing global search --- Ultron/views.py | 9 ++-- followup/models.py | 2 +- templates/base.html | 11 +---- templates/search/results.html | 83 +++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 templates/search/results.html diff --git a/Ultron/views.py b/Ultron/views.py index 1a7e0fd6b5..b90efffe4d 100644 --- a/Ultron/views.py +++ b/Ultron/views.py @@ -86,18 +86,17 @@ def search(request): if pattern: jumper_list = Jumper.objects.filter( - Q(last_name__icontains=pattern) - | Q(first_name__icontains=pattern) + Q(last_name__icontains=pattern) | Q(first_name__icontains=pattern) ) skill_list = Skill.objects.filter( - Q(longLabel__icontains=pattern) | Q(shortLabel__icontains=pattern) + Q(long_label__icontains=pattern) | Q(short_label__icontains=pattern) ) context = { - 'gymnast_list': jumper_list, + 'jumper_list': jumper_list, 'skill_list': skill_list, } else: context = {} - return render(request, "results.html", context) + return render(request, "search/results.html", context) diff --git a/followup/models.py b/followup/models.py index 005d234697..eb752e4067 100644 --- a/followup/models.py +++ b/followup/models.py @@ -73,7 +73,7 @@ class Skill(models.Model): level = models.PositiveSmallIntegerField(default=0) rank = models.PositiveSmallIntegerField(default=0) numeric_notation = models.CharField(max_length=25) - ancestor = models.ManyToManyField("self", null=True, blank=True) + ancestor = models.ManyToManyField("self") def __str__(self): return "%s (%s) - %s" % ( diff --git a/templates/base.html b/templates/base.html index 1b59d1b83f..2251d4e3e0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -101,21 +101,12 @@