From d31930bf106dedbeb42cd319681fb239c90a0518 Mon Sep 17 00:00:00 2001
From: Matthew Scragg <scragg@gmail.com>
Date: Thu, 16 Jan 2014 17:12:21 -0600
Subject: [PATCH] updated wiki routes

---
 realms/__init__.py           |  5 ++---
 realms/modules/wiki/views.py | 38 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/realms/__init__.py b/realms/__init__.py
index 778a641..0176098 100644
--- a/realms/__init__.py
+++ b/realms/__init__.py
@@ -247,7 +247,7 @@ else:
 @app.before_request
 def check_subdomain():
     if not g.current_site:
-        return redirect('http://%s' % config.SERVER_NAME)
+        return redirect('http://%s' % config.DOMAIN)
 
 
 @app.after_request
@@ -296,6 +296,5 @@ def new():
 def account():
     return render_template('account/index.html')
 
-if 'devserver' not in sys.argv or os.environ.get('WERKZEUG_RUN_MAIN'):
-    app.discover()
+app.discover()
 
diff --git a/realms/modules/wiki/views.py b/realms/modules/wiki/views.py
index 930e939..4b0344c 100644
--- a/realms/modules/wiki/views.py
+++ b/realms/modules/wiki/views.py
@@ -2,10 +2,10 @@ from flask import g, render_template, request, redirect, Blueprint, flash, url_f
 from flask.ext.login import login_required
 from realms.lib.util import to_canonical, remove_ext
 
-blueprint = Blueprint('wiki', __name__, url_prefix='/wiki')
+blueprint = Blueprint('wiki', __name__)
 
 
-@blueprint.route("/_commit/<sha>/<name>")
+@blueprint.route("/wiki/_commit/<sha>/<name>")
 def commit(name, sha):
     cname = to_canonical(name)
 
@@ -13,16 +13,16 @@ def commit(name, sha):
     if data:
         return render_template('wiki/page.html', name=name, page=data, commit=sha)
     else:
-        return redirect(url_for('.create', name=cname))
+        return redirect(url_for('wiki.create', name=cname))
 
 
-@blueprint.route("/_compare/<name>/<regex('[^.]+'):fsha><regex('\.{2,3}'):dots><regex('.+'):lsha>")
+@blueprint.route("/wiki/_compare/<name>/<regex('[^.]+'):fsha><regex('\.{2,3}'):dots><regex('.+'):lsha>")
 def compare(name, fsha, dots, lsha):
     diff = g.current_wiki.compare(name, fsha, lsha)
     return render_template('wiki/compare.html', name=name, diff=diff, old=fsha, new=lsha)
 
 
-@blueprint.route("/_revert", methods=['POST'])
+@blueprint.route("/wiki/_revert", methods=['POST'])
 def revert():
     if request.method == 'POST':
         name = request.form.get('name')
@@ -31,15 +31,15 @@ def revert():
         g.current_wiki.revert_page(name, commit, message="Reverting %s" % cname,
                                    username=g.current_user.get('username'))
         flash('Page reverted', 'success')
-        return redirect(url_for('.page', name=cname))
+        return redirect(url_for('wiki.page', name=cname))
     
-@blueprint.route("/_history/<name>")
+@blueprint.route("/wiki/_history/<name>")
 def history(name):
     history = g.current_wiki.get_history(name)
     return render_template('wiki/history.html', name=name, history=history, wiki_home=url_for('wiki.page'))
 
 
-@blueprint.route("/_edit/<name>", methods=['GET', 'POST'])
+@blueprint.route("/wiki/_edit/<name>", methods=['GET', 'POST'])
 def edit(name):
     data = g.current_wiki.get_page(name)
     cname = to_canonical(name)
@@ -51,31 +51,31 @@ def edit(name):
                                   request.form['content'],
                                   message=request.form['message'],
                                   username=g.current_user.get('username'))
-        return redirect(url_for('.page', name=edit_cname))
+        return redirect(url_for('wiki.page', name=edit_cname))
     else:
         if data:
             name = remove_ext(data['name'])
             content = data['data']
             return render_template('wiki/edit.html', name=name, content=content)
         else:
-            return redirect(url_for('.create', name=cname))
+            return redirect(url_for('wiki.create', name=cname))
 
 
-@blueprint.route("/_delete/<name>", methods=['POST'])
+@blueprint.route("/wiki/_delete/<name>", methods=['POST'])
 @login_required
 def delete(name):
     pass
 
 
-@blueprint.route("/_create/", defaults={'name': None}, methods=['GET', 'POST'])
-@blueprint.route("/_create/<name>", methods=['GET', 'POST'])
+@blueprint.route("/wiki/_create/", defaults={'name': None}, methods=['GET', 'POST'])
+@blueprint.route("/wiki/_create/<name>", methods=['GET', 'POST'])
 def create(name):
     cname = ""
     if name:
         cname = to_canonical(name)
         if g.current_wiki.get_page(cname):
             # Page exists, edit instead
-            return redirect(url_for('.edit', name=cname))
+            return redirect(url_for('wiki.edit', name=cname))
 
     if request.method == 'POST':
         g.current_wiki.write_page(request.form['name'],
@@ -83,21 +83,21 @@ def create(name):
                                   message=request.form['message'],
                                   create=True,
                                   username=g.current_user.get('username'))
-        return redirect(url_for('.page', name=cname))
+        return redirect(url_for('wiki.page', name=cname))
     else:
         return render_template('wiki/edit.html', name=cname, content="")
 
 
-@blueprint.route("/", defaults={'name': 'home'})
-@blueprint.route("/<name>")
+@blueprint.route("/wiki", defaults={'name': 'home'})
+@blueprint.route("/wiki/<name>")
 def page(name):
     cname = to_canonical(name)
     if cname != name:
-        return redirect(url_for('.page', name=cname))
+        return redirect(url_for('wiki.page', name=cname))
 
     data = g.current_wiki.get_page(cname)
 
     if data:
         return render_template('wiki/page.html', name=cname, page=data)
     else:
-        return redirect(url_for('.create', name=cname))
\ No newline at end of file
+        return redirect(url_for('wiki.create', name=cname))
\ No newline at end of file