Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

implements #4, use env to configure app

Browse source
This commit is contained in:
Matthew Scragg 2014-09-29 15:22:20 -05:00
parent 675ec9c9f9
commit 2895308667
5 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

56
realms/modules/wiki/views.py
View file

@ -2,18 +2,21 @@ 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
from realms.modules.wiki.models import Wiki
from realms import config, current_user
from realms import current_user, app
blueprint = Blueprint('wiki', __name__, url_prefix=config.RELATIVE_PATH)
blueprint = Blueprint('wiki', __name__, url_prefix=app.config['RELATIVE_PATH'])
wiki = Wiki(config.WIKI_PATH)
@app.before_request
def init_wiki():
g.current_wiki = Wiki(app.config['WIKI_PATH'])
@blueprint.route("/_commit/<sha>/<name>")
def commit(name, sha):
cname = to_canonical(name)
data = wiki.get_page(cname, sha=sha)
data = g.current_wiki.get_page(cname, sha=sha)
if data:
return render_template('wiki/page.html', name=name, page=data, commit=sha)
else:
@ -22,7 +25,7 @@ def commit(name, sha):
@blueprint.route("/_compare/<name>/<regex('[^.]+'):fsha><regex('\.{2,3}'):dots><regex('.+'):lsha>")
def compare(name, fsha, dots, lsha):
diff = wiki.compare(name, fsha, lsha)
diff = g.current_wiki.compare(name, fsha, lsha)
return render_template('wiki/compare.html', name=name, diff=diff, old=fsha, new=lsha)
@ -33,43 +36,42 @@ def revert():
commit = request.form.get('commit')
cname = to_canonical(name)
if cname in config.WIKI_LOCKED_PAGES:
if cname.lower() in app.config.WIKI_LOCKED_PAGES:
flash("Page is locked")
return redirect(url_for(config.ROOT_ENDPOINT))
return redirect(url_for(app.config['ROOT_ENDPOINT']))
wiki.revert_page(name, commit, message="Reverting %s" % cname,
username=current_user.username)
g.current_wiki.revert_page(name, commit, message="Reverting %s" % cname,
username=current_user.username)
flash('Page reverted', 'success')
return redirect(url_for('wiki.page', name=cname))
@blueprint.route("/_history/<name>")
def history(name):
return render_template('wiki/history.html', name=name, history=wiki.get_history(name))
return render_template('wiki/history.html', name=name, history=g.current_wiki.get_history(name))
@blueprint.route("/_edit/<name>", methods=['GET', 'POST'])
@login_required
def edit(name):
data = wiki.get_page(name)
data = g.current_wiki.get_page(name)
cname = to_canonical(name)
if request.method == 'POST':
edit_cname = to_canonical(request.form['name'])
if edit_cname in config.WIKI_LOCKED_PAGES:
return redirect(url_for(config.ROOT_ENDPOINT))
if edit_cname.lower() in app.config['WIKI_LOCKED_PAGES']:
return redirect(url_for(app.config['ROOT_ENDPOINT']))
if edit_cname.lower() != cname.lower():
wiki.rename_page(cname, edit_cname)
g.current_wiki.rename_page(cname, edit_cname)
wiki.write_page(edit_cname,
request.form['content'],
message=request.form['message'],
username=current_user.username)
g.current_wiki.write_page(edit_cname,
request.form['content'],
message=request.form['message'],
username=current_user.username)
else:
if data:
name = remove_ext(data['name'])
content = data.get('data')
g.assets['js'].append('editor.js')
return render_template('wiki/edit.html', name=name, content=content, partials=data.get('partials'))
@ -90,20 +92,20 @@ def create(name):
if request.method == 'POST':
cname = to_canonical(request.form['name'])
if cname in config.WIKI_LOCKED_PAGES:
if cname in app.config['WIKI_LOCKED_PAGES']:
return redirect(url_for("wiki.create"))
if not cname:
return redirect(url_for("wiki.create"))
wiki.write_page(request.form['name'],
request.form['content'],
message=request.form['message'],
create=True,
username=current_user.username)
g.current_wiki.write_page(request.form['name'],
request.form['content'],
message=request.form['message'],
create=True,
username=current_user.username)
else:
cname = to_canonical(name) if name else ""
if cname and wiki.get_page(cname):
if cname and g.current_wiki.get_page(cname):
# Page exists, edit instead
return redirect(url_for('wiki.edit', name=cname))
@ -118,7 +120,7 @@ def page(name):
if cname != name:
return redirect(url_for('wiki.page', name=cname))
data = wiki.get_page(cname)
data = g.current_wiki.get_page(cname)
if data:
return render_template('wiki/page.html', name=cname, page=data, partials=data.get('partials'))