From adbe71b5df47d825591032ec6c7c499ca65da666 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Sun, 19 Aug 2012 19:57:19 -0400
Subject: [PATCH] Got simplewiki just cleaned up enough to work again, so I
 could view a page for reference.

---
 lms/djangoapps/simplewiki/views.py            | 6 +++---
 lms/templates/simplewiki/simplewiki_edit.html | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/simplewiki/views.py b/lms/djangoapps/simplewiki/views.py
index ac807b13ed..ef0928709f 100644
--- a/lms/djangoapps/simplewiki/views.py
+++ b/lms/djangoapps/simplewiki/views.py
@@ -39,7 +39,7 @@ def update_template_dictionary(dictionary, request=None, course=None, article=No
     if course:
         dictionary['course'] = course
         if 'namespace' not in dictionary:
-            dictionary['namespace'] = course.wiki_namespace
+            dictionary['namespace'] = "edX"
     else:
         dictionary['course'] = None
 
@@ -99,7 +99,7 @@ def root_redirect(request, course_id=None):
     course = get_opt_course_with_access(request.user, course_id, 'load')
 
     #TODO: Add a default namespace to settings.
-    namespace = course.wiki_namespace if course else "edX"
+    namespace = "edX"
 
     try:
         root = Article.get_root(namespace)
@@ -479,7 +479,7 @@ def not_found(request, article_path, course):
     """Generate a NOT FOUND message for some URL"""
     d = {'wiki_err_notfound': True,
          'article_path': article_path,
-         'namespace': course.wiki_namespace}
+         'namespace': "edX"}
     update_template_dictionary(d, request, course)
     return render_to_response('simplewiki/simplewiki_error.html', d)
 
diff --git a/lms/templates/simplewiki/simplewiki_edit.html b/lms/templates/simplewiki/simplewiki_edit.html
index 856dfb9cc8..0381a21857 100644
--- a/lms/templates/simplewiki/simplewiki_edit.html
+++ b/lms/templates/simplewiki/simplewiki_edit.html
@@ -69,6 +69,7 @@ ${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002
   %else:
   <input type="submit" id="submit_edit" name="edit" value="Save Changes" />
   <input type="submit" id="submit_delete" name="delete" value="Delete article" />
+  %endif
 
 <%include file="simplewiki_instructions.html"/>