From 3f88b5cf78941579cc5151050160b0ca43e44827 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Thu, 18 Oct 2012 11:18:48 -0500 Subject: add query string to filter removal --- src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Reporting') diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py index bb5a720d0..f5f2e7528 100644 --- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py +++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py @@ -119,6 +119,11 @@ def filter_navigator(context): if 'page_limit' in kwargs: del kwargs['page_limit'] + # get a query string + qs = context['request'].GET.urlencode() + if qs: + qs = '?' + qs + filters = [] for filter in filter_list: if filter == 'group': @@ -127,7 +132,7 @@ def filter_navigator(context): myargs = kwargs.copy() del myargs[filter] filters.append((filter, - reverse(view, args=args, kwargs=myargs))) + reverse(view, args=args, kwargs=myargs) + qs)) filters.sort(lambda x, y: cmp(x[0], y[0])) myargs = kwargs.copy() @@ -135,10 +140,10 @@ def filter_navigator(context): if 'group' in myargs: del myargs['group'] selected=False - groups = [('---', reverse(view, args=args, kwargs=myargs), selected)] + groups = [('---', reverse(view, args=args, kwargs=myargs) + qs, selected)] for group in Group.objects.values('name'): myargs['group'] = group['name'] - groups.append((group['name'], reverse(view, args=args, kwargs=myargs), + groups.append((group['name'], reverse(view, args=args, kwargs=myargs) + qs, group['name'] == kwargs.get('group', ''))) return {'filters': filters, 'groups': groups} -- cgit v1.2.3-1-g7c22