Merge pull request #3554 from alphagov/convert-single-line-textboxes-to-govuk-frontend

Convert single line textboxes to govuk frontend

app/main/views/api_keys.py

@@ -16,12 +16,7 @@ from app import (
     service_api_client,
 )
 from app.main import main
-from app.main.forms import (
-    CreateKeyForm,
-    GuestList,
-    ServiceDeliveryStatusCallbackForm,
-    ServiceReceiveMessagesCallbackForm,
-)
+from app.main.forms import CallbackForm, CreateKeyForm, GuestList
 from app.notify_client.api_key_api_client import (
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEAM,
@@ -195,7 +190,7 @@ def delivery_status_callback(service_id):
         else '.api_integration'
     )
 
-    form = ServiceDeliveryStatusCallbackForm(
+    form = CallbackForm(
         url=delivery_status_callback.get('url') if delivery_status_callback else '',
         bearer_token=dummy_bearer_token if delivery_status_callback else ''
     )
@@ -255,7 +250,7 @@ def received_text_messages_callback(service_id):
         return redirect(url_for('.api_integration', service_id=service_id))
 
     received_text_messages_callback = get_received_text_messages_callback()
-    form = ServiceReceiveMessagesCallbackForm(
+    form = CallbackForm(
         url=received_text_messages_callback.get('url') if received_text_messages_callback else '',
         bearer_token=dummy_bearer_token if received_text_messages_callback else ''
     )

app/main/views/jobs.py

@@ -164,10 +164,9 @@ def view_notifications(service_id, message_type=None):
         message_type=message_type,
         status=request.args.get('status') or 'sending,delivered,failed',
         page=request.args.get('page', 1),
-        to=request.form.get('to', ''),
         search_form=SearchNotificationsForm(
             message_type=message_type,
-            to=request.form.get('to', ''),
+            to=request.form.get('to'),
         ),
         things_you_can_search_by={
             'email': ['email address'],