Skip to content

Commit dceb6e1

Browse files
asset-webasset-web
committed
#TMMA-436: Update url function package location and function name as part of Django upgrade
1 parent fb91814 commit dceb6e1

File tree

1 file changed

+54
-55
lines changed

1 file changed

+54
-55
lines changed

‎temmpo/urls.py

+54-55
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
"""URL patterns for the TeMMPo applications."""
22

33
from django.conf import settings
4-
from django.conf.urls import include, url
54
from django.contrib import admin
65
from django.contrib.auth.views import LogoutView
76
from django.contrib.staticfiles.storage import staticfiles_storage
8-
from django.urls import path
7+
from django.urls import include, path, re_path
98
from django.views.generic.base import RedirectView
109
from django.views.decorators.cache import cache_page
1110
from django.views.static import serve
@@ -26,51 +25,51 @@
2625
urlpatterns = [
2726

2827
# browser app
29-
url(r'^$', HomeView.as_view(), name='home'),
30-
url(r'^credits/$', CreditsView.as_view(), name='credits'),
31-
url(r'^help/$', HelpView.as_view(), name='help'),
32-
url(r'^privacy/$', PrivacyPolicyView.as_view(), name="privacy"),
33-
34-
url(r'^search/$', SelectSearchTypeView.as_view(), name='search'),
35-
url(r'^search/select/$', ReuseSearchView.as_view(), name='reuse_search'),
36-
url(r'^search/ovidmedline/$', SearchOvidMEDLINE.as_view(), name='search_ovid_medline'),
37-
url(r'^search/pubmed/$', SearchPubMedView.as_view(), name='search_pubmed'),
38-
url(r'^search/edit/(?P<pk>\d+)/$', SearchExisting.as_view(), name="edit_search"), # Create a new search based on an existing search criteria
39-
url(r'^search/reuse/(?P<pk>\d+)/$', SearchExistingUpload.as_view(), name="reuse_upload"), # Create a new search based on previously uploaded set of abstracts
40-
url(r'^exposure/(?P<pk>\d+)/$', ExposureSelector.as_view(), name="exposure_selector"),
41-
url(r'^mediator/(?P<pk>\d+)/$', MediatorSelector.as_view(), name="mediator_selector"),
42-
url(r'^outcome/(?P<pk>\d+)/$', OutcomeSelector.as_view(), name="outcome_selector"),
43-
url(r'^filter/(?P<pk>\d+)/$', FilterSelector.as_view(), name="filter_selector"),
44-
45-
url(r'^mesh-terms-json/$', cache_page(60 * 60 * 24 * 355)(MeshTermsAllAsJSON.as_view()), name="mesh_terms_as_json"),
46-
url(r'^mesh_terms_search_json/$', MeshTermSearchJSON.as_view(), name="mesh_terms_search_json"),
47-
url(r'^mesh-terms-json-for-criteria/(?P<pk>\d+)/(?P<type>(exposure|mediator|outcome))/$', MeshTermsAsJSON.as_view(), name="mesh_terms_as_json_for_criteria"),
48-
49-
url(r'^results/(?P<pk>\d+)/$', ResultsSankeyView.as_view(), name='results'),
50-
url(r'^results/bubble/(?P<pk>\d+)/$', ResultsBubbleView.as_view(), name='results_bubble'),
51-
url(r'^results/$', ResultsListingView.as_view(), name='results_listing'),
52-
53-
url(r'^search-criteria/(?P<pk>\d+)/$', CriteriaView.as_view(), name='criteria'),
54-
55-
url(r'^data/delete/(?P<pk>\d+)/$', DeleteSearch.as_view(), name='delete_data'),
56-
57-
url(r'^data/v4/count/(?P<pk>\d+)/$', CountDataView.as_view(), name='count_data'),
58-
url(r'^data/v4/abstracts/(?P<pk>\d+)/$', AbstractDataView.as_view(), name='abstracts_data'),
59-
url(r'^data/v4/json/(?P<pk>\d+)/$', JSONDataView.as_view(), name='json_data'),
60-
61-
url(r'^data/v3/count/(?P<pk>\d+)/$', CountDataViewV3.as_view(), name='count_data_v3'),
62-
url(r'^data/v3/abstracts/(?P<pk>\d+)/$', AbstractDataViewV3.as_view(), name='abstracts_data_v3'),
63-
url(r'^data/v3/json/(?P<pk>\d+)/$', JSONDataViewV3.as_view(), name='json_data_v3'),
64-
65-
url(r'^data/v1/count/(?P<pk>\d+)/$', CountDataViewV1.as_view(), name='count_data_v1'),
66-
url(r'^data/v1/abstracts/(?P<pk>\d+)/$', AbstractDataViewV1.as_view(), name='abstracts_data_v1'),
67-
url(r'^data/v1/json/(?P<pk>\d+)/$', JSONDataViewV1.as_view(), name='json_data_v1'),
68-
69-
url(r'^account/$', UserAccountView.as_view(), name='account'),
70-
url(r'^close-account/(?P<pk>\d+)/$', CloseAccount.as_view(), name='close_account'),
71-
url(r'^account-closed/$', AccountClosedConfirmation.as_view(), name='account_closed'),
72-
url(r'^manage-users/$', UsersListingView.as_view(), name='manage_users'),
73-
url(r'^delete-user/(?P<pk>\d+)/$', DeleteUser.as_view(), name='delete_user'),
28+
re_path(r'^$', HomeView.as_view(), name='home'),
29+
re_path(r'^credits/$', CreditsView.as_view(), name='credits'),
30+
re_path(r'^help/$', HelpView.as_view(), name='help'),
31+
re_path(r'^privacy/$', PrivacyPolicyView.as_view(), name="privacy"),
32+
33+
re_path(r'^search/$', SelectSearchTypeView.as_view(), name='search'),
34+
re_path(r'^search/select/$', ReuseSearchView.as_view(), name='reuse_search'),
35+
re_path(r'^search/ovidmedline/$', SearchOvidMEDLINE.as_view(), name='search_ovid_medline'),
36+
re_path(r'^search/pubmed/$', SearchPubMedView.as_view(), name='search_pubmed'),
37+
re_path(r'^search/edit/(?P<pk>\d+)/$', SearchExisting.as_view(), name="edit_search"), # Create a new search based on an existing search criteria
38+
re_path(r'^search/reuse/(?P<pk>\d+)/$', SearchExistingUpload.as_view(), name="reuse_upload"), # Create a new search based on previously uploaded set of abstracts
39+
re_path(r'^exposure/(?P<pk>\d+)/$', ExposureSelector.as_view(), name="exposure_selector"),
40+
re_path(r'^mediator/(?P<pk>\d+)/$', MediatorSelector.as_view(), name="mediator_selector"),
41+
re_path(r'^outcome/(?P<pk>\d+)/$', OutcomeSelector.as_view(), name="outcome_selector"),
42+
re_path(r'^filter/(?P<pk>\d+)/$', FilterSelector.as_view(), name="filter_selector"),
43+
44+
re_path(r'^mesh-terms-json/$', cache_page(60 * 60 * 24 * 355)(MeshTermsAllAsJSON.as_view()), name="mesh_terms_as_json"),
45+
re_path(r'^mesh_terms_search_json/$', MeshTermSearchJSON.as_view(), name="mesh_terms_search_json"),
46+
re_path(r'^mesh-terms-json-for-criteria/(?P<pk>\d+)/(?P<type>(exposure|mediator|outcome))/$', MeshTermsAsJSON.as_view(), name="mesh_terms_as_json_for_criteria"),
47+
48+
re_path(r'^results/(?P<pk>\d+)/$', ResultsSankeyView.as_view(), name='results'),
49+
re_path(r'^results/bubble/(?P<pk>\d+)/$', ResultsBubbleView.as_view(), name='results_bubble'),
50+
re_path(r'^results/$', ResultsListingView.as_view(), name='results_listing'),
51+
52+
re_path(r'^search-criteria/(?P<pk>\d+)/$', CriteriaView.as_view(), name='criteria'),
53+
54+
re_path(r'^data/delete/(?P<pk>\d+)/$', DeleteSearch.as_view(), name='delete_data'),
55+
56+
re_path(r'^data/v4/count/(?P<pk>\d+)/$', CountDataView.as_view(), name='count_data'),
57+
re_path(r'^data/v4/abstracts/(?P<pk>\d+)/$', AbstractDataView.as_view(), name='abstracts_data'),
58+
re_path(r'^data/v4/json/(?P<pk>\d+)/$', JSONDataView.as_view(), name='json_data'),
59+
60+
re_path(r'^data/v3/count/(?P<pk>\d+)/$', CountDataViewV3.as_view(), name='count_data_v3'),
61+
re_path(r'^data/v3/abstracts/(?P<pk>\d+)/$', AbstractDataViewV3.as_view(), name='abstracts_data_v3'),
62+
re_path(r'^data/v3/json/(?P<pk>\d+)/$', JSONDataViewV3.as_view(), name='json_data_v3'),
63+
64+
re_path(r'^data/v1/count/(?P<pk>\d+)/$', CountDataViewV1.as_view(), name='count_data_v1'),
65+
re_path(r'^data/v1/abstracts/(?P<pk>\d+)/$', AbstractDataViewV1.as_view(), name='abstracts_data_v1'),
66+
re_path(r'^data/v1/json/(?P<pk>\d+)/$', JSONDataViewV1.as_view(), name='json_data_v1'),
67+
68+
re_path(r'^account/$', UserAccountView.as_view(), name='account'),
69+
re_path(r'^close-account/(?P<pk>\d+)/$', CloseAccount.as_view(), name='close_account'),
70+
re_path(r'^account-closed/$', AccountClosedConfirmation.as_view(), name='account_closed'),
71+
re_path(r'^manage-users/$', UsersListingView.as_view(), name='manage_users'),
72+
re_path(r'^delete-user/(?P<pk>\d+)/$', DeleteUser.as_view(), name='delete_user'),
7473

7574
# Favicon
7675
path(
@@ -79,30 +78,30 @@
7978
),
8079

8180
# Probe page
82-
url(r'^probe/$',
81+
re_path(r'^probe/$',
8382
cache_page(15)(ProbeView.as_view()),
8483
name='probe'),
8584

8685
# Django admin
8786
path('admin/', admin.site.urls),
8887

8988
# Django user authentication
90-
url(r'^logout/$', LogoutView.as_view(), name="logout"),
91-
url(r'^', include('registration.backends.default.urls')),
92-
url(r'^', include('django.contrib.auth.urls')),
89+
re_path(r'^logout/$', LogoutView.as_view(), name="logout"),
90+
re_path(r'^', include('registration.backends.default.urls')),
91+
re_path(r'^', include('django.contrib.auth.urls')),
9392

9493
# django-rq Redis backed message queue
95-
url(r'^django-rq/', include('django_rq.urls')),
94+
re_path(r'^django-rq/', include('django_rq.urls')),
9695

9796
# autocomplete
98-
url(r'^meshterm-autocomplete/$', MeSHTermAutocomplete.as_view(), name='meshterm-autocomplete'),
97+
re_path(r'^meshterm-autocomplete/$', MeSHTermAutocomplete.as_view(), name='meshterm-autocomplete'),
9998
]
10099

101100
# For non Apache fronted Django development server scenarios.
102101
if not settings.USING_APACHE:
103102

104103
urlpatterns += [
105-
url(r'^media/(?P<path>.*)$', serve, {
104+
re_path(r'^media/(?P<path>.*)$', serve, {
106105
'document_root': settings.MEDIA_ROOT,
107106
}),
108107
]
@@ -111,5 +110,5 @@
111110
import debug_toolbar
112111

113112
urlpatterns += [
114-
url(r'^__debug__/', include(debug_toolbar.urls)),
113+
re_path(r'^__debug__/', include(debug_toolbar.urls)),
115114
]

0 commit comments

Comments
 (0)