web_reports: add filters to the grid view

2 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/Reports/reports/urls.py b/src/lib/Bcfg2/Server/Reports/reports/urls.py
index c7255101f..90c6c724d 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/urls.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/urls.py
@@ -21,7 +21,6 @@ urlpatterns = patterns('Bcfg2.Server.Reports.reports',
 
 urlpatterns += patterns('Bcfg2.Server.Reports.reports',
     *timeviewUrls(
-        (r'^grid/?$', 'views.client_index', None, 'reports_grid_view'),
         (r'^summary/?$', 'views.display_summary', None, 'reports_summary'),
         (r'^timing/?$', 'views.display_timing', None, 'reports_timing'),
         (r'^elements/(?P<type>\w+)/?$', 'views.config_item_list', None, 'reports_item_list'),
@@ -31,6 +30,7 @@ urlpatterns += patterns('Bcfg2.Server.Reports.reports',
 
 urlpatterns += patterns('Bcfg2.Server.Reports.reports',
     *filteredUrls(*timeviewUrls(
+        (r'^grid/?$', 'views.client_index', None, 'reports_grid_view'),
         (r'^detailed/?$',
             'views.client_detailed_list', None, 'reports_detailed_list')
 )))
diff --git a/src/lib/Bcfg2/Server/Reports/reports/views.py b/src/lib/Bcfg2/Server/Reports/reports/views.py
index 4ebf8e5b0..d316c5713 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/views.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/views.py
@@ -230,16 +230,16 @@ def common_problems(request, timestamp=None, threshold=None):
 
 
 @timeview
-def client_index(request, timestamp=None):
+def client_index(request, timestamp=None, **kwargs):
     """
     Render a grid view of active clients.
 
     Keyword parameters:
-      timestamp -- datetime objectto render from
+      timestamp -- datetime object to render from
 
     """
-    list = Interaction.objects.interaction_per_client(timestamp).select_related()\
-           .order_by("client__name").all()
+    list = _handle_filters(Interaction.objects.interaction_per_client(timestamp), **kwargs).\
+           select_related().order_by("client__name").all()
 
     return render_to_response('clients/index.html',
                               {'inter_list': list,