From ed85e40bcbce07cc5e2d67b985e48c836d0a9079 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 5 Aug 2011 07:53:30 -0400 Subject: fixed regex in reports_client_history view; made all reports hostname regexes consistent --- src/lib/Server/Reports/reports/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Reports') 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\S+)/(?P\d+)/?$', 'views.client_detail', name='reports_client_detail_pk'), - url(r'^client/(?P\S+)/?$', 'views.client_detail', name='reports_client_detail'), + url(r'^client/(?P[^/]+)/(?P\d+)/?$', 'views.client_detail', name='reports_client_detail_pk'), + url(r'^client/(?P[^/]+)/?$', 'views.client_detail', name='reports_client_detail'), url(r'^elements/(?P\w+)/(?P\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[\w\-\.]+)/?$', + (r'^history/(?P[^/]+)/?$', 'views.render_history_view', None, 'reports_client_history'), ))) -- cgit v1.2.3-1-g7c22