Renamed searchpicks templates to searchpromotions

.jscsrc

@@ -12,7 +12,7 @@
         "**/*.min.js",
         "**/vendor/**/*.js",
         "./wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/inline_panel.js",
-        "./wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpicks/includes/searchpicks_formset.js",
+        "./wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js",
         "./wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.js",
         "./wagtail/wagtailsnippets/templates/wagtailsnippets/chooser/chosen.js",
         "./wagtail/wagtailimages/templates/wagtailimages/chooser/image_chosen.js",

wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/add.html

@@ -23,7 +23,7 @@
                     {% include "wagtailsearch/queries/chooser_field.html" with field=query_form.query_string only %}   
                 </li>
                 <li>
-                    {% include "wagtailsearchpicks/includes/searchpicks_formset.html" with formset=searchpicks_formset only %}
+                    {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
                 </li>
                 <li><input type="submit" value="{% trans 'Save' %}" /></li>
             </ul>
@@ -38,7 +38,7 @@
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
-        {% include "wagtailsearchpicks/includes/searchpicks_formset.js" with formset=searchpicks_formset only %}
+        {% include "wagtailsearchpromotions/includes/searchpromotions_formset.js" with formset=searchpicks_formset only %}
         {% include "wagtailsearch/queries/chooser_field.js" only %}
 
         $(function() {

wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/edit.html

@@ -13,7 +13,7 @@
                 {% include "wagtailsearch/queries/chooser_field.html" with field=query_form.query_string only %}   
             </li>
             <li> 
-                {% include "wagtailsearchpicks/includes/searchpicks_formset.html" with formset=searchpicks_formset only %}
+                {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
             </li>
             <li>
                 <input type="submit" value="{% trans 'Save' %}" />
@@ -30,7 +30,7 @@
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
-        {% include "wagtailsearchpicks/includes/searchpicks_formset.js" with formset=searchpicks_formset only  %}
+        {% include "wagtailsearchpromotions/includes/searchpromotions_formset.js" with formset=searchpicks_formset only  %}
         {% include "wagtailsearch/queries/chooser_field.js" only %}
 
         $(function() {

wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html

@@ -2,13 +2,13 @@
 {{ formset.management_form }}
 <ul class="multiple" id="id_{{ formset.prefix }}-FORMS">
     {% for form in formset.forms %}
-        {% include "wagtailsearchpicks/includes/searchpick_form.html" with form=form only %}
+        {% include "wagtailsearchpromotions/includes/searchpromotion_form.html" with form=form only %}
     {% endfor %}
 </ul>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
 {% escapescript %}
-{% include "wagtailsearchpicks/includes/searchpick_form.html" with form=formset.empty_form only %}
+{% include "wagtailsearchpromotions/includes/searchpromotion_form.html" with form=formset.empty_form only %}
 {% endescapescript %}
 </script>
 

wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/index.html

@@ -20,7 +20,7 @@
 
      <div class="nice-padding">
         <div id="editorspicks-results" class="redirects">
-            {% include "wagtailsearchpicks/results.html" %}
+            {% include "wagtailsearchpromotions/results.html" %}
         </div>
     </div>
 {% endblock %}

wagtail/contrib/wagtailsearchpicks/templates/wagtailsearchpromotions/results.html

@@ -10,7 +10,7 @@
         </h2>
     {% endif %}
 
-    {% include "wagtailsearchpicks/list.html" %}
+    {% include "wagtailsearchpromotions/list.html" %}
 
     {% include "wagtailadmin/shared/pagination_nav.html" with items=queries is_searching=is_searching linkurl="wagtailsearchpicks_index" %}
 {% else %}

wagtail/contrib/wagtailsearchpicks/tests.py

@@ -79,7 +79,7 @@ class TestSearchPromotionsIndexView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearchpicks:index'))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/index.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/index.html')
 
     def test_search(self):
         response = self.client.get(reverse('wagtailsearchpicks:index'), {'q': "Hello"})
@@ -102,7 +102,7 @@ class TestSearchPromotionsIndexView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/index.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/index.html')
 
         # Check that we got the correct page
         self.assertEqual(response.context['queries'].number, 2)
@@ -114,7 +114,7 @@ class TestSearchPromotionsIndexView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/index.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/index.html')
 
         # Check that we got page one
         self.assertEqual(response.context['queries'].number, 1)
@@ -126,7 +126,7 @@ class TestSearchPromotionsIndexView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/index.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/index.html')
 
         # Check that we got the last page
         self.assertEqual(response.context['queries'].number, response.context['queries'].paginator.num_pages)
@@ -139,7 +139,7 @@ class TestSearchPromotionsAddView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearchpicks:add'))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/add.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/add.html')
 
     def test_post(self):
         # Submit
@@ -188,7 +188,7 @@ class TestSearchPromotionsEditView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearchpicks:edit', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/edit.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/edit.html')
 
     def test_post(self):
         # Submit
@@ -317,7 +317,7 @@ class TestSearchPromotionsDeleteView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.client.get(reverse('wagtailsearchpicks:delete', args=(self.query.id, )))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailsearchpicks/confirm_delete.html')
+        self.assertTemplateUsed(response, 'wagtailsearchpromotions/confirm_delete.html')
 
     def test_post(self):
         # Submit

wagtail/contrib/wagtailsearchpicks/views.py

@@ -36,13 +36,13 @@ def index(request):
         queries = paginator.page(paginator.num_pages)
 
     if request.is_ajax():
-        return render(request, "wagtailsearchpicks/results.html", {
+        return render(request, "wagtailsearchpromotions/results.html", {
             'is_searching': is_searching,
             'queries': queries,
             'query_string': query_string,
         })
     else:
-        return render(request, 'wagtailsearchpicks/index.html', {
+        return render(request, 'wagtailsearchpromotions/index.html', {
             'is_searching': is_searching,
             'queries': queries,
             'query_string': query_string,
@@ -96,7 +96,7 @@ def add(request):
         query_form = search_forms.QueryForm()
         searchpicks_formset = forms.SearchPromotionsFormSet()
 
-    return render(request, 'wagtailsearchpicks/add.html', {
+    return render(request, 'wagtailsearchpromotions/add.html', {
         'query_form': query_form,
         'searchpicks_formset': searchpicks_formset,
     })
@@ -130,7 +130,7 @@ def edit(request, query_id):
         query_form = search_forms.QueryForm(initial=dict(query_string=query.query_string))
         searchpicks_formset = forms.SearchPromotionsFormSet(instance=query)
 
-    return render(request, 'wagtailsearchpicks/edit.html', {
+    return render(request, 'wagtailsearchpromotions/edit.html', {
         'query_form': query_form,
         'searchpicks_formset': searchpicks_formset,
         'query': query,
@@ -145,6 +145,6 @@ def delete(request, query_id):
         messages.success(request, _("Editor's picks deleted."))
         return redirect('wagtailsearchpicks:index')
 
-    return render(request, 'wagtailsearchpicks/confirm_delete.html', {
+    return render(request, 'wagtailsearchpromotions/confirm_delete.html', {
         'query': query,
     })