diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-10-23 13:30:29 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-10-23 13:30:29 -0500 |
| commit | 82db7888a6370233ce29cbcc27c16053b662e16c (patch) | |
| tree | 5e3f9fe4553180de4d8d282999f79f93d8f9a507 /src/lib/Bcfg2/Reporting/utils.py | |
| parent | 37ee63c35cc1a9378f3167d63a3254d6d3d239a9 (diff) | |
| parent | 99f4fb302bddf6dea291ee505f90748e9c54bc71 (diff) | |
| download | bcfg2-82db7888a6370233ce29cbcc27c16053b662e16c.tar.gz bcfg2-82db7888a6370233ce29cbcc27c16053b662e16c.tar.bz2 bcfg2-82db7888a6370233ce29cbcc27c16053b662e16c.zip | |
Merge branch 'reporting-fix-filter' of https://github.com/AlexanderS/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Reporting/utils.py')
| -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 |