Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22616 from edx/BOM-1120

Browse Source 
Removed the deprecated usage of include urls.
This commit is contained in:
Aarif
2020-01-07 12:52:57 +05:00
committed by GitHub
parent f10a7550d7 cfbac50a12
commit 8f5a166ab4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/urls.py
View File

@@ -180,19 +180,22 @@ if settings.WIKI_ENABLED:
from course_wiki import views as course_wiki_views
from django_notify.urls import get_pattern as notify_pattern
wiki_url_patterns, wiki_app_name, wiki_namespace = wiki_pattern()
notify_url_patterns, notify_app_name, notify_namespace = notify_pattern()
urlpatterns += [
# First we include views from course_wiki that we use to override the default views.
# They come first in the urlpatterns so they get resolved first
url('^wiki/create-root/$', course_wiki_views.root_create, name='root_create'),
url(r'^wiki/', include(wiki_pattern())),
url(r'^notify/', include(notify_pattern())),
url(r'^wiki/', include((wiki_url_patterns, wiki_app_name), namespace=wiki_namespace)),
url(r'^notify/', include((notify_url_patterns, notify_app_name), namespace=notify_namespace)),
# These urls are for viewing the wiki in the context of a course. They should
# never be returned by a reverse() so they come after the other url patterns
url(r'^courses/{}/course_wiki/?$'.format(settings.COURSE_ID_PATTERN),
course_wiki_views.course_wiki_redirect, name='course_wiki'),
url(r'^courses/{}/wiki/'.format(settings.COURSE_KEY_REGEX),
include(wiki_pattern(app_name='course_wiki_do_not_reverse', namespace='course_wiki_do_not_reverse'))),
include((wiki_url_patterns, 'course_wiki_do_not_reverse'), namespace='course_wiki_do_not_reverse')),
]
COURSE_URLS = [
@@ -769,7 +772,7 @@ if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
# changes go through our user portal and follow complexity requirements.
url(r'^admin/password_change/$', handler404),
url(r'^admin/auth/user/\d+/password/$', handler404),
url(r'^admin/', include(admin.site.urls)),
url(r'^admin/', admin.site.urls),
]
if configuration_helpers.get_value('ENABLE_BULK_ENROLLMENT_VIEW', settings.FEATURES.get('ENABLE_BULK_ENROLLMENT_VIEW')):