Commit a04e4bfb by Bridger Maxwell

Fixed wiki urls bug. Fixed reverse for course wiki.

parent 88282b5b
......@@ -22,7 +22,7 @@ def url_class(url):
% endif
% endif
% if settings.WIKI_ENABLED:
<li class="wiki"><a href="${reverse('wiki_root', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
<li class="wiki"><a href="${reverse('course_wiki', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
% endif
% if user.is_authenticated():
<li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
......
......@@ -146,10 +146,6 @@ if settings.WIKI_ENABLED:
from wiki.urls import get_pattern as wiki_pattern
from django_notify.urls import get_pattern as notify_pattern
# urlpatterns += (
# url(r'^wiki/', include('simplewiki.urls')),
# url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/wiki/', include('simplewiki.urls')),
# )
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
......@@ -157,8 +153,7 @@ if settings.WIKI_ENABLED:
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/wiki$',
'course_wiki.views.course_wiki_redirect', name="course_wiki"),
url(r'wiki/', include(wiki_pattern())),
url(r'^wiki/', include(wiki_pattern())),
url(r'^notify/', include(notify_pattern())),
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment