From 361e409d4ecf2bf1d9b47f8a7f1373359679a9fb Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Sat, 18 Aug 2012 00:02:09 -0400
Subject: [PATCH] Got the tests passing!
---
.../course_wiki/plugins/markdownedx/wiki_plugin.py | 10 +++++-----
lms/envs/common.py | 2 +-
requirements.txt | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
index f88ebc280e5..a33b4e86d1b 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 d6364f03b60..ee09816b697 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 45c511f459c..4e078cda51f 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
--
GitLab