diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-08-05 07:53:30 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-08-05 07:53:30 -0400 |
| commit | ed85e40bcbce07cc5e2d67b985e48c836d0a9079 (patch) | |
| tree | 3676cf4f9ba2a3d19844215f11a672ed7d822f72 /src/lib/Server/Reports | |
| parent | 6e5d92aa58d175681e05b588ac8a97d2ccdf262d (diff) | |
| download | bcfg2-ed85e40bcbce07cc5e2d67b985e48c836d0a9079.tar.gz bcfg2-ed85e40bcbce07cc5e2d67b985e48c836d0a9079.tar.bz2 bcfg2-ed85e40bcbce07cc5e2d67b985e48c836d0a9079.zip | |
fixed regex in reports_client_history view; made all reports hostname regexes consistent
Diffstat (limited to 'src/lib/Server/Reports')
| -rw-r--r-- | src/lib/Server/Reports/reports/urls.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Reports/reports/urls.py b/src/lib/Server/Reports/reports/urls.py index 9970d26a1..1937114ef 100644 --- a/src/lib/Server/Reports/reports/urls.py +++ b/src/lib/Server/Reports/reports/urls.py @@ -14,8 +14,8 @@ urlpatterns = patterns('Bcfg2.Server.Reports.reports', (r'^$', newRoot), url(r'^manage/?$', 'views.client_manage', name='reports_client_manage'), - url(r'^client/(?P<hostname>\S+)/(?P<pk>\d+)/?$', 'views.client_detail', name='reports_client_detail_pk'), - url(r'^client/(?P<hostname>\S+)/?$', 'views.client_detail', name='reports_client_detail'), + url(r'^client/(?P<hostname>[^/]+)/(?P<pk>\d+)/?$', 'views.client_detail', name='reports_client_detail_pk'), + url(r'^client/(?P<hostname>[^/]+)/?$', 'views.client_detail', name='reports_client_detail'), url(r'^elements/(?P<type>\w+)/(?P<pk>\d+)/?$', 'views.config_item', name='reports_item'), ) @@ -37,7 +37,7 @@ urlpatterns += patterns('Bcfg2.Server.Reports.reports', *paginatedUrls( *filteredUrls( (r'^history/?$', 'views.render_history_view', None, 'reports_history'), - (r'^history/(?P<hostname>[\w\-\.]+)/?$', + (r'^history/(?P<hostname>[^/]+)/?$', 'views.render_history_view', None, 'reports_client_history'), ))) |