From f8fa426adb709dcebbdf0cc4b0894c418ced9361 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 13 Jun 2020 01:27:42 +0100 Subject: [PATCH] rearrange for clarity --- urls.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/urls.py b/urls.py index 95f35a4..b6c087b 100644 --- a/urls.py +++ b/urls.py @@ -9,6 +9,7 @@ from .core.views_other import * from .core.views_caves import * from .core.views_survex import * from .core.models import * +from troggle.core.views_statistics import pathsreport, stats admin.autodiscover() @@ -74,7 +75,8 @@ actualurlpatterns = patterns('', url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch), - url(r'^statistics/?$', views_other.stats, name="stats"), + url(r'^statistics/?$', views_statistics.stats, name="stats"), + url(r'^pathsreport.*$', views_statistics.pathsreport, name="pathsreport"), # url(r'^survey/?$', surveyindex, name="survey"), #url referred to troggle menu.. # url(r'^survey/(?P\d\d\d\d)\#(?P\d*)$', survey, name="survey"), #Survey object @@ -86,7 +88,7 @@ actualurlpatterns = patterns('', url(r'^cave/(?P[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"), (r'^downloadqms$', views_other.downloadQMs), - (r'^admin/doc/?', include('django.contrib.admindocs.urls')), + (r'^admin/doc/?', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/). #url(r'^admin/(.*)', admin.site.get_urls, name="admin"), (r'^admin/', include(admin.site.urls)), @@ -141,7 +143,6 @@ actualurlpatterns = patterns('', # (r'^gallery/(?P.*)$', 'django.views.static.serve', # {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), - url(r'^pathsreport.*$', views_logbooks.pathsreport, name="pathsreport"), url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),