From 83d5c3142e769126defdbe83d78f762c0814bb76 Mon Sep 17 00:00:00 2001
From: Alexander Pace <alexander.pace@ligo.org>
Date: Fri, 22 Nov 2024 13:56:05 +0000
Subject: [PATCH] give the user a warning and truncate results for large
browser queries
---
gracedb/search/views.py | 9 +++++----
gracedb/templates/search/query.html | 8 ++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gracedb/search/views.py b/gracedb/search/views.py
index e79ce7d1a..738099c8f 100644
--- a/gracedb/search/views.py
+++ b/gracedb/search/views.py
@@ -71,12 +71,12 @@ def search(request):
err_msg = (f'The query you have entered returned more results '
f'({num_objects}) than the allowable maximum '
f' for viewing in the browser '
- f'({settings.MAX_DATATABLES_RESULTS}). Please limit '
- f'your query or utilize the '
+ f'({settings.MAX_DATATABLES_RESULTS}), and have been '
+ f'truncated below. For complete results, please utilize the '
f'<a href="https://ligo-gracedb.readthedocs.io/en/latest/api.html">'
f'client API</a>.')
- form.add_error('query', mark_safe(err_msg))
- return render(request, 'search/query.html', context={'form': form})
+ context['message_text'] = mark_safe(err_msg)
+ objects=objects[:settings.MAX_DATATABLES_RESULTS]
# Get call from template for populating datatable
if _format == 'F':
@@ -111,6 +111,7 @@ def search(request):
else:
# Initial page with no query
form = MainSearchForm()
+ context['message_text'] = None
# Update context
context['form'] = form
diff --git a/gracedb/templates/search/query.html b/gracedb/templates/search/query.html
index d8c934adc..200abe031 100644
--- a/gracedb/templates/search/query.html
+++ b/gracedb/templates/search/query.html
@@ -7,6 +7,14 @@
{% block content %}
<p>Test and MDC events and superevents are not included in the search results by default. See the query help (link below) for information on how to search for events and superevents in those categories.</p>
+{% if message_text is not None %}
+
+<div class="alert alert-warning" role="alert">
+ {{ message_text }}
+</div>
+
+{% endif %}
+
<form method="GET" name="search_form">
<table width="100%">
{{ form.as_table }}
--
GitLab