manager: add an option to search regardless of moderation status

diff --git a/earwig/manager/templates/earwig/manager_home.html b/earwig/manager/templates/earwig/manager_home.html
index 1f0636151ea0099ffcae5f9bd862f3f805e090c4..fcf63af284115190e01c9074281b03eb047952ea 100644 (file)
--- a/earwig/manager/templates/earwig/manager_home.html
+++ b/earwig/manager/templates/earwig/manager_home.html
@@ -15,6 +15,7 @@
   <p>
    <input name="q" type="search" value="{{view.get_query_filter}}">
    <select name="q_status">
+     <option value="_all">{% trans "All" %}</option>
      {% for status_id, status_label in statuses %}
      <option value="{{ status_id }}" {% if status_id == view.get_status_filter %}selected{% endif %}>{{ status_label }}</option>
      {% endfor %}
@@ -53,7 +54,7 @@
  </tr>
  {% empty %}
  <tr>
-   <td colspan="4">{% trans "Nothing to moderate" %}</td>
+   <td colspan="4">{% trans "No search results" %}</td>
  </tr>
  {% endfor %}
 </tbody>

diff --git a/earwig/manager/views.py b/earwig/manager/views.py
index 1cab3e5f9baeb10f54ada76b3fe6a5e806ab5d33..ff70b40fbd94b8cd4421048e4dbca24176dd8faa 100644 (file)
--- a/earwig/manager/views.py
+++ b/earwig/manager/views.py
@@ -30,7 +30,9 @@ class Homepage(ListView):
     template_name = 'earwig/manager_home.html'
 
     def get_queryset(self, **kwargs):
-        qs = self.model.objects.filter(status=self.get_status_filter()).select_related()
+        qs = self.model.objects.select_related()
+        if self.get_status_filter() != '_all':
+            qs = qs.filter(status=self.get_status_filter())
         query = self.get_query_filter()
         if query:
             qs = qs.filter(Q(title__icontains=query) |