diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-12 17:38:27 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-12 17:38:27 +0200 |
| commit | 885e8d1ae2027fb3d62356fdc2a5cf53347df568 (patch) | |
| tree | 09d551cfdf2175fc3c914076e24d972fdf1e0536 | |
| parent | 5c68f95a382fdcd17fb5016a98b7eb7af4e057a6 (diff) | |
| download | bcfg2-885e8d1ae2027fb3d62356fdc2a5cf53347df568.tar.gz bcfg2-885e8d1ae2027fb3d62356fdc2a5cf53347df568.tar.bz2 bcfg2-885e8d1ae2027fb3d62356fdc2a5cf53347df568.zip | |
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.
| -rwxr-xr-x | src/lib/Bcfg2/Reporting/utils.py | 12 |
1 files changed, 6 insertions, 6 deletions
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 |