support if key is not unique + displaying links

MoinMoin/apps/frontend/views.py

 # Copyright: 2012 MoinMoin:CheerXiao
 # Copyright: 2003-2013 MoinMoin:ThomasWaldmann
 # Copyright: 2011 MoinMoin:AkashSinha
 # Copyright: 2011 MoinMoin:ReimarBauer
 # Copyright: 2008 MoinMoin:FlorianKrupicka
 # Copyright: 2010 MoinMoin:DiogenesAugusto
 # Copyright: 2001 Richard Jones <richard@bizarsoftware.com.au>
 # Copyright: 2001 Juergen Hermann <jh@web.de>
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
@@ skipping 29 matching lines @@
 
 from whoosh.query import Term, Prefix, And, Or, DateRange, Every
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
 
 from MoinMoin.i18n import _, L_, N_
 from MoinMoin.themes import render_template, contenttype_to_class
 from MoinMoin.apps.frontend import frontend
 from MoinMoin.forms import (OptionalText, RequiredText, URL, YourOpenID, YourEmail, RequiredPassword, Checkbox,
-                            InlineCheckbox, Select, Names, Tags, Natural, Hidden, MultiSelect, Enum)
+                            InlineCheckbox, Select, Names, Tags, Natural, Hidden, MultiSelect, Enum, validate_name,
+                            NameNotValidError)
 from MoinMoin.items import BaseChangeForm, Item, NonExistent, NameNotUniqueError, FieldNotUniqueError
 from MoinMoin.items.content import content_registry
 from MoinMoin import user, util
 from MoinMoin.constants.keys import *
 from MoinMoin.constants.itemtypes import ITEMTYPE_DEFAULT
 from MoinMoin.constants.chartypes import CHARS_UPPER, CHARS_LOWER
 from MoinMoin.util import crypto
 from MoinMoin.util.interwiki import url_for_item, split_fqname
 from MoinMoin.search import SearchForm
 from MoinMoin.search.analyzers import item_name_analyzer
@@ skipping 290 matching lines @@
     Decorator factory to apply add_presenter().
     """
     return partial(add_presenter, view=view, add_trail=add_trail, abort404=abort404)
 
 
 # The first form accepts POST to allow modifying behavior like modify_item.
 # The second form only accpets GET since modifying a historical revision is not allowed (yet).
 @frontend.route('/<itemname:item_name>', defaults=dict(rev=CURRENT), methods=['GET', 'POST'])
 @frontend.route('/+show/+<rev>/<itemname:item_name>', methods=['GET'])
 def show_item(item_name, rev):
-    flaskg.user.add_trail(item_name)
     item_displayed.send(app._get_current_object(),
                         item_name=item_name)
     try:
         item = Item.create(item_name, rev_id=rev)
+        flaskg.user.add_trail(item_name)
         result = item.do_show(rev)
     except AccessDenied:
         abort(403)
     except FieldNotUniqueError:
         fqname = split_fqname(item_name)
         revs = flaskg.storage.documents(**fqname.query)
-        item_names = []
+        fq_names = []
         for rev in revs:
-            item_names.extend(rev.fqnames)
+            fq_names.extend(rev.fqnames)
         return render_template("link_list_no_item_panel.html",
                                headline=_("Items with %(field)s %(value)s", field=fqname.field, value=fqname.value),
                                item_name=fqname.fullname,
-                               item_names=item_names)
+                               fq_names=fq_names)
     return result
 
 
 @frontend.route('/<itemname:item_name>/')  # note: unwanted trailing slash
 @frontend.route('/+show/<itemname:item_name>')
 def redirect_show_item(item_name):
     return redirect(url_for_item(item_name))
 
 
 @presenter('dom', abort404=False)
@@ skipping 127 matching lines @@
         abort(403)
     if not flaskg.user.may.write(item_name):
         abort(403)
     return item.do_modify()
 
 
 class TargetChangeForm(BaseChangeForm):
     target = RequiredText.using(label=L_('Target')).with_properties(placeholder=L_("The name of the target item"))
 
 
+class ValidRevert(Validator):
+    """
+    Validator for a valid revert form.
+    """
+    invalid_name_msg = ''
+
+    def validate(self, element, state):
+        """
+        Check whether the names present in the previous meta are not taken by some other item.
+        """
+        try:
+            validate_name(state['meta'], state[FQNAME], state['meta'].get(ITEMID))
+            return True
+        except NameNotValidError as e:
+            self.invalid_name_msg = _(e)
+            return self.note_error(element, state, 'invalid_name_msg')
+
+
 class RevertItemForm(BaseChangeForm):
     name = 'revert_item'
+    validators = [ValidRevert()]
 
 
 class DeleteItemForm(BaseChangeForm):
     name = 'delete_item'
 
 
 class DestroyItemForm(BaseChangeForm):
     name = 'destroy_item'
 
 
@@ skipping 10 matching lines @@
     if not flaskg.user.may.write(item_name):
         abort(403)
     if isinstance(item, NonExistent):
         abort(404, item_name)
     if request.method in ['GET', 'HEAD']:
         form = RevertItemForm.from_defaults()
         TextCha(form).amend_form()
     elif request.method == 'POST':
         form = RevertItemForm.from_flat(request.form)
         TextCha(form).amend_form()
-        if form.validate():
+        state = dict(fqname=item.fqname, meta=dict(item.meta))
+        if form.validate(state):
             item.revert(form['comment'])
             return redirect(url_for_item(item_name))
     return render_template(item.revert_template,
-                           item=item, item_name=item_name,
+                           item=item, fqname=item.fqname,
                            rev_id=rev,
                            form=form,
     )
 
 
 @frontend.route('/+rename/<itemname:item_name>', methods=['GET', 'POST'])
 def rename_item(item_name):
     try:
         item = Item.create(item_name)
     except AccessDenied:
@@ skipping 1403 matching lines @@
         response.cache_control.public = is_public
         response.cache_control.max_age = cache_timeout
         response.expires = int(time.time() + cache_timeout)
     return response
 
 
 @frontend.errorhandler(404)
 def page_not_found(e):
     return render_template('404.html',
                            item_name=e.description), 404