From ef31e160d9063aca71279c815ec3db81896b0b7c Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 7 Dec 2021 21:51:49 +0000 Subject: [PATCH] Consistently use create_form and search_form as context variables --- .../workflows/task_chooser/chooser.html | 6 +-- .../task_chooser/includes/create_form.html | 6 +-- .../task_chooser/includes/results.html | 6 +-- wagtail/admin/tests/test_workflows.py | 6 +-- wagtail/admin/views/workflows.py | 38 +++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html index 780cd3e9f9..bb9a8f7049 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html @@ -12,8 +12,8 @@
{% if can_create %}
- {% if createform %} - {% include "wagtailadmin/workflows/task_chooser/includes/create_form.html" with form=createform %} + {% if create_form %} + {% include "wagtailadmin/workflows/task_chooser/includes/create_form.html" %} {% else %} {% include "wagtailadmin/workflows/task_chooser/includes/select_task_type.html" %} {% endif %} @@ -22,7 +22,7 @@
    - {% for field in searchform %} + {% for field in search_form %} {% include "wagtailadmin/shared/field_as_li.html" with field=field %} {% endfor %}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html index ad299d7cae..d04970d338 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html @@ -1,7 +1,7 @@ {% load i18n wagtailadmin_tags %} -{{ form.media.css }} -{{ form.media.js }} +{{ create_form.media.css }} +{{ create_form.media.js }} {% if task_types|length > 1 %} {% trans "Choose a different task type" %} @@ -11,7 +11,7 @@ {% csrf_token %}
    - {% for field in form %} + {% for field in create_form %} {% if field.is_hidden %} {{ field }} {% else %} diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html index f13359e975..4a80958123 100644 --- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html +++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html @@ -1,6 +1,6 @@ {% load i18n wagtailadmin_tags %} {% if tasks %} - {% if searchform.is_searching %} + {% if search_form.is_searching %}

    {% blocktrans count counter=tasks.paginator.count %} There is {{ counter }} match @@ -18,7 +18,7 @@ {% trans "Name" %} - {% if searchform.specific_task_model_selected %} + {% if search_form.specific_task_model_selected %} {# TODO #} {% else %} @@ -36,7 +36,7 @@
    {{ task.name }}
    - {% if searchform.specific_task_model_selected %} + {% if search_form.specific_task_model_selected %} {# TODO #} {% else %} diff --git a/wagtail/admin/tests/test_workflows.py b/wagtail/admin/tests/test_workflows.py index 79ebd49fa8..e9feeb6ff0 100644 --- a/wagtail/admin/tests/test_workflows.py +++ b/wagtail/admin/tests/test_workflows.py @@ -1606,7 +1606,7 @@ class TestTaskChooserView(TestCase, WagtailTestUtils): self.assertTemplateUsed(response, "wagtailadmin/workflows/task_chooser/includes/select_task_type.html") self.assertTemplateUsed(response, "wagtailadmin/workflows/task_chooser/includes/results.html") self.assertTemplateNotUsed(response, "wagtailadmin/workflows/task_chooser/includes/create_form.html") - self.assertFalse(response.context['searchform'].is_searching()) + self.assertFalse(response.context['search_form'].is_searching()) # check that only active (non-disabled) tasks are listed self.assertEqual([task.name for task in response.context['tasks'].object_list], ['Enabled foo', 'Moderators approval']) @@ -1617,7 +1617,7 @@ class TestTaskChooserView(TestCase, WagtailTestUtils): self.assertTemplateUsed(response, "wagtailadmin/workflows/task_chooser/includes/results.html") self.assertTemplateNotUsed(response, "wagtailadmin/workflows/task_chooser/chooser.html") - self.assertTrue(response.context['searchform'].is_searching()) + self.assertTrue(response.context['search_form'].is_searching()) self.assertEqual(response.context['query_string'], 'foo') # check that only active (non-disabled) tasks are listed self.assertEqual([task.name for task in response.context['tasks'].object_list], ['Enabled foo']) @@ -1630,7 +1630,7 @@ class TestTaskChooserView(TestCase, WagtailTestUtils): # When pagination is used, only the results template should be rendered self.assertTemplateUsed(response, "wagtailadmin/workflows/task_chooser/includes/results.html") self.assertTemplateNotUsed(response, "wagtailadmin/workflows/task_chooser/chooser.html") - self.assertFalse(response.context['searchform'].is_searching()) + self.assertFalse(response.context['search_form'].is_searching()) def test_get_with_create_model_selected(self): response = self.client.get(reverse('wagtailadmin_workflows:task_chooser_create') + '?create_model=wagtailcore.GroupApprovalTask') diff --git a/wagtail/admin/views/workflows.py b/wagtail/admin/views/workflows.py index a38486702b..619641386d 100644 --- a/wagtail/admin/views/workflows.py +++ b/wagtail/admin/views/workflows.py @@ -572,28 +572,28 @@ class TaskChooserView(BaseTaskChooserView): def get(self, request): create_form_class = self.get_create_form_class() if create_form_class: - self.createform = create_form_class(prefix='create-task') + self.create_form = create_form_class(prefix='create-task') else: - self.createform = None + self.create_form = None return self.render_to_response() def render_to_response(self): - searchform = TaskChooserSearchForm(task_type_choices=self.get_task_type_filter_choices()) - tasks = searchform.task_model.objects.filter(active=True).order_by(Lower('name')) + search_form = TaskChooserSearchForm(task_type_choices=self.get_task_type_filter_choices()) + tasks = search_form.task_model.objects.filter(active=True).order_by(Lower('name')) paginator = Paginator(tasks, per_page=10) tasks = paginator.get_page(self.request.GET.get('p')) chooser_html_context = { 'tasks': tasks, - 'searchform': searchform, - 'createform': self.createform, + 'search_form': search_form, + 'create_form': self.create_form, 'can_create': self.can_create, 'add_url': reverse('wagtailadmin_workflows:task_chooser_create') + '?' + self.request.GET.urlencode() if self.create_model else None } - if not self.createform: + if not self.create_form: chooser_html_context['task_types'] = self.get_task_type_options() js_context = self.get_form_js_context() @@ -609,9 +609,9 @@ class TaskChooserCreateView(BaseTaskChooserView): def get(self, request): create_form_class = self.get_create_form_class() if create_form_class: - self.createform = create_form_class(prefix='create-task') + self.create_form = create_form_class(prefix='create-task') else: - self.createform = None + self.create_form = None return self.render_to_response() @@ -620,18 +620,18 @@ class TaskChooserCreateView(BaseTaskChooserView): if not create_form_class: return HttpResponseBadRequest() - self.createform = create_form_class(request.POST, request.FILES, prefix='create-task') + self.create_form = create_form_class(request.POST, request.FILES, prefix='create-task') - if self.createform.is_valid(): - task = self.createform.save() + if self.create_form.is_valid(): + task = self.create_form.save() return get_task_chosen_response(request, task) else: return self.render_to_response() def render_to_response(self): - if self.createform: + if self.create_form: tab_html = render_to_string("wagtailadmin/workflows/task_chooser/includes/create_form.html", { - 'form': self.createform, + 'create_form': self.create_form, 'add_url': reverse('wagtailadmin_workflows:task_chooser_create') + '?' + self.request.GET.urlencode() if self.create_model else None, 'task_types': self.get_task_type_options(), }, self.request) @@ -652,17 +652,17 @@ class TaskChooserCreateView(BaseTaskChooserView): class TaskChooserResultsView(BaseTaskChooserView): def get(self, request): - searchform = TaskChooserSearchForm(request.GET, task_type_choices=self.get_task_type_filter_choices()) - tasks = all_tasks = searchform.task_model.objects.filter(active=True).order_by(Lower('name')) + search_form = TaskChooserSearchForm(request.GET, task_type_choices=self.get_task_type_filter_choices()) + tasks = all_tasks = search_form.task_model.objects.filter(active=True).order_by(Lower('name')) q = '' - if searchform.is_searching(): + if search_form.is_searching(): # Note: I decided not to use wagtailsearch here. This is because # wagtailsearch creates a new index for each model you make # searchable and this might affect someone's quota. I doubt there # would ever be enough tasks to require using anything more than # an icontains anyway. - q = searchform.cleaned_data['q'] + q = search_form.cleaned_data['q'] tasks = tasks.filter(name__icontains=q) # Pagination @@ -670,7 +670,7 @@ class TaskChooserResultsView(BaseTaskChooserView): tasks = paginator.get_page(request.GET.get('p')) return TemplateResponse(request, "wagtailadmin/workflows/task_chooser/includes/results.html", { - 'searchform': searchform, + 'search_form': search_form, 'tasks': tasks, 'all_tasks': all_tasks, 'query_string': q,