Merge branch 'reporting-fix-filter' of https://github.com/AlexanderS/bcfg2 into maint

2 files changed, 50 insertions, 39 deletions

diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
index 489682f30..0ee5cd0d6 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
@@ -111,47 +111,58 @@ def filter_navigator(context):
     try:
         path = context['request'].META['PATH_INFO']
         view, args, kwargs = resolve(path)
+    except (Resolver404, KeyError):
+        return dict()
 
-        # Strip any page limits and numbers
-        if 'page_number' in kwargs:
-            del kwargs['page_number']
-        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':
-                continue
-            if filter in kwargs:
-                myargs = kwargs.copy()
-                del myargs[filter]
+    # Strip any page limits and numbers
+    if 'page_number' in kwargs:
+        del kwargs['page_number']
+    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':
+            continue
+        if filter in kwargs:
+            myargs = kwargs.copy()
+            del myargs[filter]
+            try:
                 filters.append((filter,
                                 reverse(view, args=args, kwargs=myargs) + qs))
-        filters.sort(key=lambda x: x[0])
-
-        myargs = kwargs.copy()
-        selected = True
-        if 'group' in myargs:
-            del myargs['group']
-            selected = False
-        groups = [('---',
-                   reverse(view, args=args, kwargs=myargs) + qs,
-                   selected)]
-        for group in Group.objects.values('name'):
+            except NoReverseMatch:
+                pass
+    filters.sort(key=lambda x: x[0])
+
+    myargs = kwargs.copy()
+    selected = True
+    if 'group' in myargs:
+        del myargs['group']
+        selected = False
+
+    groups = []
+    try:
+        groups.append(('---',
+                       reverse(view, args=args, kwargs=myargs) + qs,
+                       selected))
+    except NoReverseMatch:
+        pass
+
+    for group in Group.objects.values('name'):
+        try:
             myargs['group'] = group['name']
             groups.append((group['name'],
                            reverse(view, args=args, kwargs=myargs) + qs,
                            group['name'] == kwargs.get('group', '')))
+        except NoReverseMatch:
+            pass
 
-        return {'filters': filters, 'groups': groups}
-    except (Resolver404, NoReverseMatch, ValueError, KeyError):
-        pass
-    return dict()
+    return {'filters': filters, 'groups': groups}
 
 
 def _subtract_or_na(mdict, x, y):
diff --git a/src/lib/Bcfg2/Reporting/utils.py b/src/lib/Bcfg2/Reporting/utils.py
index 0d394fcd8..694f38824 100755
--- a/src/lib/Bcfg2/Reporting/utils.py
+++ b/src/lib/Bcfg2/Reporting/utils.py
@@ -96,12 +96,12 @@ def filteredUrls(pattern, view, kwargs=None, name=None):
         tail = mtail.group(1)
     pattern = pattern[:len(pattern) - len(tail)]
     for filter in ('/state/(?P<state>\w+)',
-                   '/group/(?P<group>[\w\-\.]+)',
-                   '/group/(?P<group>[\w\-\.]+)/(?P<state>[A-Za-z]+)',
-                   '/server/(?P<server>[\w\-\.]+)',
-                   '/server/(?P<server>[\w\-\.]+)/(?P<state>[A-Za-z]+)',
-                   '/server/(?P<server>[\w\-\.]+)/group/(?P<group>[\w\-\.]+)',
-                   '/server/(?P<server>[\w\-\.]+)/group/(?P<group>[\w\-\.]+)/(?P<state>[A-Za-z]+)'):
+                   '/group/(?P<group>[^/]+)',
+                   '/group/(?P<group>[^/]+)/(?P<state>[A-Za-z]+)',
+                   '/server/(?P<server>[^/]+)',
+                   '/server/(?P<server>[^/]+)/(?P<state>[A-Za-z]+)',
+                   '/server/(?P<server>[^/]+)/group/(?P<group>[^/]+)',
+                   '/server/(?P<server>[^/]+)/group/(?P<group>[^/]+)/(?P<state>[A-Za-z]+)'):
         results += [(pattern + filter + tail, view, kwargs)]
     return results