diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py index f88ebc280e56c6299d3bdf841a6054633f15354e..a33b4e86d1bc37f7f57397ece36c9a5c5941dd60 100644 --- a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py +++ b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse_lazy -from wiki.core import plugins_registry -from wiki import plugins +from wiki.core import plugins_registry, baseplugin +import wiki from course_wiki.plugins.markdownedx import mdx_circuit, mdx_wikipath, mdx_mathjax, mdx_video -class ExtendMarkdownPlugin(plugins.BasePlugin): +class ExtendMarkdownPlugin(baseplugin.BasePlugin): """ This plugin simply loads all of the markdown extensions we use in edX. """ - wiki_base_url = reverse("wiki:get", kwargs={'path' : ""}) + wiki_base_url = reverse_lazy("wiki:get", kwargs={'path' : ""}) markdown_extensions = [mdx_circuit.CircuitExtension(configs={}), #mdx_image.ImageExtension() , #This one doesn't work. Tries to import simplewiki.settings diff --git a/lms/envs/common.py b/lms/envs/common.py index d6364f03b603697736ec1397068f380c849493a9..ee09816b697d4069185273db618c7542ed08a606 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -555,8 +555,8 @@ INSTALLED_APPS = ( #For the wiki 'wiki', # The new django-wiki from benjaoming - 'course_wiki', # Our customizations 'django_notify', + 'course_wiki', # Our customizations 'mptt', 'sekizai', 'wiki.plugins.attachments', diff --git a/requirements.txt b/requirements.txt index 45c511f459c3626bd5e97d9e3f940740486d43e2..4e078cda51f36c92c992450227384d64db143dd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,5 +44,5 @@ django-ses django-storages django-threaded-multihost django-sekizai<0.7 -git+git://github.com/benjaoming/django-wiki.git@d58dcbc75 +git+git://github.com/benjaoming/django-wiki.git@97f8413 -r repo-requirements.txt