From 885e8d1ae2027fb3d62356fdc2a5cf53347df568 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Sun, 12 Oct 2014 17:38:27 +0200
Subject: Reporting: fix filter urls

The regex match for the filter urls were to strict. They disallowed
some charaters, that are valid in group names and so the django reverse
mechanism for building urls failed.
---
 src/lib/Bcfg2/Reporting/utils.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

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
 
-- 
cgit v1.2.3-1-g7c22