From bfcdaf08f71eec4f31ebd3041df887a6d553fd3d Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 18 Aug 2016 02:27:14 +0200 Subject: Reporting: Remove outdated comments --- src/lib/Bcfg2/Reporting/urls.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/lib/Bcfg2/Reporting/urls.py b/src/lib/Bcfg2/Reporting/urls.py index 3a40cb932..9e1fa3e4a 100644 --- a/src/lib/Bcfg2/Reporting/urls.py +++ b/src/lib/Bcfg2/Reporting/urls.py @@ -48,16 +48,3 @@ urlpatterns += patterns('Bcfg2.Reporting', (r'^history/(?P[^/|]+)/?$', 'views.render_history_view', None, 'reports_client_history'), ))) - - # Uncomment this for admin: - #(r'^admin/', include('django.contrib.admin.urls')), - - -## Uncomment this section if using authentication -#urlpatterns += patterns('', -# (r'^login/$', 'django.contrib.auth.views.login', -# {'template_name': 'auth/login.html'}), -# (r'^logout/$', 'django.contrib.auth.views.logout', -# {'template_name': 'auth/logout.html'}) -# ) - -- cgit v1.2.3-1-g7c22 From bbf5da0f5e5dcfccb624067af9ed924ff172d0de Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 18 Aug 2016 16:15:45 +0200 Subject: Reporting: Ensure we have an empty prefix in the url patterns --- src/lib/Bcfg2/Reporting/urls.py | 43 +++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/lib/Bcfg2/Reporting/urls.py b/src/lib/Bcfg2/Reporting/urls.py index 9e1fa3e4a..1ff955cad 100644 --- a/src/lib/Bcfg2/Reporting/urls.py +++ b/src/lib/Bcfg2/Reporting/urls.py @@ -2,6 +2,7 @@ from Bcfg2.Reporting.Compat import url, patterns # django compat imports from django.core.urlresolvers import reverse, NoReverseMatch from django.http import HttpResponsePermanentRedirect from Bcfg2.Reporting.utils import filteredUrls, paginatedUrls, timeviewUrls +from Bcfg2.Reporting import views handler500 = 'Bcfg2.Reporting.views.server_error' @@ -12,39 +13,39 @@ def newRoot(request): grid_view = '/grid' return HttpResponsePermanentRedirect(grid_view) -urlpatterns = patterns('Bcfg2.Reporting', +urlpatterns = patterns('', (r'^$', newRoot), - url(r'^manage/?$', 'views.client_manage', name='reports_client_manage'), - 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'^element/(?P\w+)/(?P\d+)/(?P\d+)?/?$', 'views.config_item', name='reports_item'), - url(r'^element/(?P\w+)/(?P\d+)/?$', 'views.config_item', name='reports_item'), - url(r'^entry/(?P\w+)/(?P\w+)/?$', 'views.entry_status', name='reports_entry'), + url(r'^manage/?$', views.client_manage, name='reports_client_manage'), + 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'^element/(?P\w+)/(?P\d+)/(?P\d+)?/?$', views.config_item, name='reports_item'), + url(r'^element/(?P\w+)/(?P\d+)/?$', views.config_item, name='reports_item'), + url(r'^entry/(?P\w+)/(?P\w+)/?$', views.entry_status, name='reports_entry'), ) -urlpatterns += patterns('Bcfg2.Reporting', +urlpatterns += patterns('', *timeviewUrls( - (r'^summary/?$', 'views.display_summary', None, 'reports_summary'), - (r'^timing/?$', 'views.display_timing', None, 'reports_timing'), - (r'^common/group/(?P[^/]+)/(?P\d+)/?$', 'views.common_problems', None, 'reports_common_problems'), - (r'^common/group/(?P[^/]+)+/?$', 'views.common_problems', None, 'reports_common_problems'), - (r'^common/(?P\d+)/?$', 'views.common_problems', None, 'reports_common_problems'), - (r'^common/?$', 'views.common_problems', None, 'reports_common_problems'), + (r'^summary/?$', views.display_summary, None, 'reports_summary'), + (r'^timing/?$', views.display_timing, None, 'reports_timing'), + (r'^common/group/(?P[^/]+)/(?P\d+)/?$', views.common_problems, None, 'reports_common_problems'), + (r'^common/group/(?P[^/]+)+/?$', views.common_problems, None, 'reports_common_problems'), + (r'^common/(?P\d+)/?$', views.common_problems, None, 'reports_common_problems'), + (r'^common/?$', views.common_problems, None, 'reports_common_problems'), )) -urlpatterns += patterns('Bcfg2.Reporting', +urlpatterns += patterns('', *filteredUrls(*timeviewUrls( - (r'^grid/?$', 'views.client_index', None, 'reports_grid_view'), + (r'^grid/?$', views.client_index, None, 'reports_grid_view'), (r'^detailed/?$', - 'views.client_detailed_list', None, 'reports_detailed_list'), - (r'^elements/(?P\w+)/?$', 'views.config_item_list', None, 'reports_item_list'), + views.client_detailed_list, None, 'reports_detailed_list'), + (r'^elements/(?P\w+)/?$', views.config_item_list, None, 'reports_item_list'), ))) -urlpatterns += patterns('Bcfg2.Reporting', +urlpatterns += patterns('', *paginatedUrls( *filteredUrls( (r'^history/?$', - 'views.render_history_view', None, 'reports_history'), + views.render_history_view, None, 'reports_history'), (r'^history/(?P[^/|]+)/?$', - 'views.render_history_view', None, 'reports_client_history'), + views.render_history_view, None, 'reports_client_history'), ))) -- cgit v1.2.3-1-g7c22 From c1dea2a8676c0acdf51b68d0d38d454746bc96d8 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 18 Aug 2016 16:09:11 +0200 Subject: Reporting/Compat: Add patterns compat method django 1.10 removed the patterns method, so we define it manually a bit easier than the old upstream variant but sufficient for our needs. --- src/lib/Bcfg2/Reporting/Compat.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lib/Bcfg2/Reporting/Compat.py b/src/lib/Bcfg2/Reporting/Compat.py index 9113fdb91..9754314a7 100644 --- a/src/lib/Bcfg2/Reporting/Compat.py +++ b/src/lib/Bcfg2/Reporting/Compat.py @@ -13,4 +13,16 @@ try: from django.conf.urls.defaults import url, patterns except ImportError: # Django > 1.6 - from django.conf.urls import url, patterns + from django.conf.urls import url + + try: + from django.conf.urls import patterns + except: + # Django > 1.10 + def patterns(_prefix, urls): + url_list = list() + for u in urls: + if isinstance(url_tuple, (list, tuple)): + u = url(*u) + url_list.append(u) + return url_list -- cgit v1.2.3-1-g7c22 From 06638068fb0526c4266fb008aa4a63f2cb578895 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 18 Aug 2016 16:19:01 +0200 Subject: testsuite: Bump django version We should be compatible with django-1.10 now. --- testsuite/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/install.sh b/testsuite/install.sh index d8e5079be..1a9f0dcfc 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -26,7 +26,7 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then if [[ $PYVER != "2.7" ]]; then pip install 'django<1.7' 'South<0.8' else - pip install 'django<1.10' + pip install django fi fi fi -- cgit v1.2.3-1-g7c22