web_reports: add group filtering logic to grid and detailed list

3 files changed, 31 insertions, 3 deletions

diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
index 134e237d6..45ba20b86 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html
@@ -9,6 +9,7 @@
 {% block pagebanner %}Clients - Grid View{% endblock %}
 
 {% block content %}
+{% filter_navigator %}
 {% if inter_list %}
   <table class='grid-view' align='center'>
   {% for inter in inter_list %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html
index 6fbe585ab..759415507 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html
@@ -1,13 +1,25 @@
 {% spaceless %}
+<div class="filter_bar">
+<form name='filter_form'>
 {% if filters %}
 {% for filter, filter_url in filters %}
   {% if forloop.first %}
-    <div class="filter_bar">Active filters (click to remove):
+    Active filters (click to remove):
   {% endif %}
        <a href='{{ filter_url }}'>{{ filter|capfirst }}</a>{% if not forloop.last %}, {% endif %}
   {% if forloop.last %}
-    </div>
+    {% if groups %}|{% endif %}
   {% endif %}
 {% endfor %}
 {% endif %}
+{% if groups %}
+<label for="id_group">Group filter:</label>
+<select id="id_group" name="group" onchange="javascript:url=document.forms['filter_form'].group.value; if(url) { location.href=url }">
+  {% for group, group_url, selected in groups %}
+    <option label="{{group}}" value="{{group_url}}" {% if selected %}selected {% endif %}/>
+  {% endfor %}
+</select>
+{% endif %}
+</form>
+</div>
 {% endspaceless %}
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py
index d65833c48..61895df57 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py
@@ -11,6 +11,7 @@ from django.utils.encoding import smart_unicode, smart_str
 from django.utils.safestring import mark_safe
 from datetime import datetime, timedelta
 from Bcfg2.Server.Reports.utils import filter_list
+from Bcfg2.Server.Reports.reports.models import Group
 
 register = template.Library()
 
@@ -120,13 +121,27 @@ def filter_navigator(context):
 
         filters = []
         for filter in filter_list:
+            if filter == 'group':
+                continue
             if filter in kwargs:
                 myargs = kwargs.copy()
                 del myargs[filter]
                 filters.append((filter,
                                 reverse(view, args=args, kwargs=myargs)))
         filters.sort(lambda x, y: cmp(x[0], y[0]))
-        return {'filters': filters}
+
+        myargs = kwargs.copy()
+        selected=True
+        if 'group' in myargs:
+            del myargs['group']
+            selected=False
+        groups = [('---', reverse(view, args=args, kwargs=myargs), selected)]
+        for group in Group.objects.values('name'):
+            myargs['group'] = group['name']
+            groups.append((group['name'], reverse(view, args=args, kwargs=myargs), 
+                group['name'] == kwargs.get('group', '')))
+            
+        return {'filters': filters, 'groups': groups}
     except (Resolver404, NoReverseMatch, ValueError, KeyError):
         pass
     return dict()