redirect to renamed wiki pages

Author: davidism

sopy/ext/sqlalchemy.py

@@ -1,6 +1,6 @@
 from flask import current_app, g
 from flask_sqlalchemy import SQLAlchemy as BaseSQLAlchemy, _camelcase_re, _QueryProperty, BaseQuery
-from sqlalchemy import inspect
+from sqlalchemy import inspect, MetaData
 from sqlalchemy.ext.declarative import DeclarativeMeta as BaseDeclarativeMeta, declared_attr, declarative_base
 from sqlalchemy.orm import was_deleted
 
@@ -109,7 +109,14 @@ def init_app(self, app):
         app.shell_context_processor(lambda: {'db': self})
 
     def make_declarative_base(self):
-        base = declarative_base(cls=self.BaseModel, name='Model', metaclass=self.DeclarativeMeta)
+        metadata = MetaData(naming_convention={
+            'pk': 'pk_%(table_name)s',
+            'fk': 'fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s',
+            'uq': 'uq_%(table_name)s_%(column_0_name)s',
+            'ix': 'ix_%(table_name)s_%(column_0_name)s',
+            'ck': 'ck_%(table_name)s_%(constraint_name)s',
+        })
+        base = declarative_base(metadata=metadata, cls=self.BaseModel, name='Model', metaclass=self.DeclarativeMeta)
         base.query = _QueryProperty(self)
         base.db = self
         return base

sopy/migrations/a7cdfb24f1_wiki_redirect.py

@@ -0,0 +1,27 @@
+"""wiki redirect
+
+Revision ID: a7cdfb24f1
+Revises: 54a3343a03b
+Create Date: 2015-05-16 09:43:45.455535
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = 'a7cdfb24f1'
+down_revision = '54a3343a03b'
+branch_labels = ()
+depends_on = None
+
+
+def upgrade():
+    op.add_column('wiki_page', sa.Column('redirect_id', sa.Integer(), nullable=True))
+    op.create_unique_constraint(op.f('uq_wiki_page_title'), 'wiki_page', ['title'])
+    op.create_foreign_key(op.f('fk_wiki_page_redirect_id_wiki_page'), 'wiki_page', 'wiki_page', ['redirect_id'], ['id'])
+
+
+def downgrade():
+    op.drop_constraint(op.f('fk_wiki_page_redirect_id_wiki_page'), 'wiki_page', type_='foreignkey')
+    op.drop_constraint(op.f('uq_wiki_page_title'), 'wiki_page', type_='unique')
+    op.drop_column('wiki_page', 'redirect_id')

sopy/templates/wiki/detail.html

@@ -8,13 +8,21 @@ <h2 class="page-header">{% block title %}{{ page.title }}{% endblock %}</h2>
         {% if page.community %}<div class="alert alert-info">This page is in community mode.  Any user with 100 rep may edit it.</div>{% endif %}
 
         <ul class="list-inline pull-right">
-            <li><small><i>Last edited {{ page.updated|datetimeformat }}</i></small></li>
+            <li><small><i>Last edited on {{ page.updated|datetimeformat }} by {{ page.author }}</i></small></li>
             {% if has_group('editor') or page.draft or page.community %}<li><a href="{{ page.update_url }}" class="btn btn-success btn-sm"><i class="fa fa-edit"></i> Edit</a></li>{% endif %}
             {% if has_group('editor') %}<li><a href="{{ page.delete_url }}" class="btn btn-danger btn-sm"><i class="fa fa-minus"></i> Remove</a></li>{% endif %}
         </ul>
 
         <div class="clearfix"></div>
 
+        {% if redirect_from %}
+            <p>Redirected from <a href="{{ url_for('wiki.detail', title=redirect_from, no_redirect=1) }}">{{ redirect_from }}</a></p>
+        {% endif %}
+
+        {% if page.redirect %}
+            <p>Redirects to <a href="{{ page.redirect.detail_url }}">{{ page.redirect.title }}</a></p>
+        {% endif %}
+
         {% if page.body %}{{ page.body|markdown }}{% endif %}
     </div></div>
 {% endblock %}

sopy/wiki/forms.py

@@ -1,8 +1,8 @@
 from flask_wtf import Form
 import re
+from markupsafe import Markup
 from wtforms.fields import TextAreaField, BooleanField
 from wtforms.validators import DataRequired, ValidationError
-from sopy import db
 from sopy.ext.forms import StripStringField
 from sopy.wiki.models import WikiPage
 
@@ -25,14 +25,12 @@ def validate_title(self, field):
         if match:
             raise ValidationError('Invalid characters: "{}"'.format(match.group(1)))
 
-        unique_title_q = db.session.query(db.func.count(WikiPage.id)).filter(WikiPage.title == title)
+        existing = WikiPage.query.filter_by(title=title).first()
 
-        if self.obj is not None:
-            # When editing an existing page, only check *other* pages for duplicate titles.
-            unique_title_q = unique_title_q.filter(WikiPage.id != self.obj.id)
-
-        if unique_title_q.scalar():
-            raise ValidationError('A page with this title already exists.')
+        # check existing title when creating new page
+        # skip if existing page is current page when editing
+        if existing is not None and (self.obj is None or self.obj.id != existing.id):
+            raise ValidationError(Markup('<a href="{}">A page with this title</a> already exists.  Rename or delete it before continuing.'.format(existing.detail_url)))
 
 
 class WikiPageEditorForm(WikiPageForm):

sopy/wiki/models.py

@@ -12,8 +12,10 @@ class WikiPage(IDModel):
     draft = db.Column(db.Boolean, nullable=False, default=False)
     community = db.Column(db.Boolean, nullable=False, default=False)
     author_id = db.Column(db.Integer, db.ForeignKey(User.id), nullable=False)
+    redirect_id = db.Column(db.Integer, db.ForeignKey('wiki_page.id'))
 
     author = db.relationship(User)
+    redirect = db.relationship(lambda: WikiPage, remote_side=lambda: (WikiPage.id,), backref='redirects')
 
     def __str__(self):
         return self.title

sopy/wiki/views.py

@@ -1,4 +1,4 @@
-from flask import redirect, render_template
+from flask import redirect, render_template, request, session, url_for
 from flask_wtf import Form
 from sopy import db
 from sopy.auth.login import group_required, current_user, login_required, require_group, has_group
@@ -10,7 +10,7 @@
 
 @bp.route('/')
 def index():
-    pages = WikiPage.query.order_by(WikiPage.title)
+    pages = WikiPage.query.filter(WikiPage.redirect_id.is_(None)).order_by(WikiPage.title)
 
     if not has_group('editor'):
         pages = pages.filter(db.not_(WikiPage.draft))
@@ -20,11 +20,21 @@ def index():
     return render_template('wiki/index.html', pages=pages)
 
 
-@bp.route('/<wiki_title:title>/')
+@bp.route('/<wiki_title:title>')
 def detail(title):
-    page = WikiPage.query.filter(WikiPage.title == title).first_or_404()
+    page = WikiPage.query.filter(WikiPage.title == title).options(db.joinedload(WikiPage.redirect)).first_or_404()
+
+    if page.redirect and 'no_redirect' not in request.args:
+        session['redirect_from'] = title
+        return redirect(page.redirect.detail_url)
 
-    return render_template('wiki/detail.html', page=page)
+    if 'redirect_from' in session:
+        redirect_from = session['redirect_from']
+        del session['redirect_from']
+    else:
+        redirect_from = None
+
+    return render_template('wiki/detail.html', page=page, redirect_from=redirect_from)
 
 
 @bp.route('/create', endpoint='create', methods=['GET', 'POST'])
@@ -42,6 +52,11 @@ def update(title=None):
         if page is None:
             page = WikiPage()
             db.session.add(page)
+        else:
+            page.redirect = None
+
+            if page.title != form.title.data:
+                db.session.add(WikiPage(title=page.title, body='', redirect=page, author=current_user))
 
         page.author = current_user
         form.populate_obj(page)