From 4eb1a98f21ea28ffc7c12492d2851cc22a9c8f80 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 7 Jan 2020 21:34:47 +0500 Subject: [PATCH] BOM-1108 Updating wiki. --- lms/urls.py | 8 ++++---- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lms/urls.py b/lms/urls.py index 30cf2ca98f..885262dc9a 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -180,15 +180,15 @@ 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() + wiki_url_patterns, wiki_app_name = wiki_pattern() + notify_url_patterns, notify_app_name = 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_url_patterns, wiki_app_name), namespace=wiki_namespace)), - url(r'^notify/', include((notify_url_patterns, notify_app_name), namespace=notify_namespace)), + url(r'^wiki/', include((wiki_url_patterns, wiki_app_name), namespace='wiki')), + url(r'^notify/', include((notify_url_patterns, notify_app_name), namespace='notify')), # 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 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4936a09ac6..cb9080008b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock -e common/lib/capa -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail --e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki -e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e . diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6f3f867ea8..3332871f69 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock -e common/lib/capa -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail --e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki -e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e . diff --git a/requirements/edx/github.in b/requirements/edx/github.in index abed0f780d..d4d215096d 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -56,7 +56,7 @@ git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce8 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # Third-party: --e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 1584265298..7081400827 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock -e common/lib/capa -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail --e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@v0.0.24#egg=django-wiki -e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e .