From a906552c25ee26d0e03608235448f08018d2952f Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Thu, 15 Aug 2019 12:41:46 +0100 Subject: [PATCH] Require data on search by name form This lets us build leaner views when using this form. --- app/main/forms.py | 5 ++++- app/main/views/find_services.py | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 50f510d19..b33f3ef42 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1127,7 +1127,10 @@ class RequiredDateFilterForm(StripWhitespaceForm): class SearchByNameForm(StripWhitespaceForm): - search = SearchField('Search by name') + search = SearchField( + 'Search by name', + validators=[DataRequired("You need to enter full or partial name to search by.")], + ) class SearchUsersByEmailForm(StripWhitespaceForm): diff --git a/app/main/views/find_services.py b/app/main/views/find_services.py index abc78594f..21448ef47 100644 --- a/app/main/views/find_services.py +++ b/app/main/views/find_services.py @@ -1,4 +1,4 @@ -from flask import render_template, request +from flask import render_template from app import service_api_client from app.main import main @@ -11,13 +11,10 @@ from app.utils import user_is_platform_admin def find_services_by_name(): form = SearchByNameForm() services_found = None - status = 200 if form.validate_on_submit(): services_found = service_api_client.find_services_by_name(service_name=form.search.data)['data'] - elif request.method == 'POST': - status = 400 return render_template( 'views/find-services/find-services-by-name.html', form=form, services_found=services_found - ), status + )