changeset 2678:80f8ef6e4087

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 01 Aug 2014 12:18:41 +0200
parents 4ad3b2654ce3 (current diff) fded75e578be (diff)
children 215f9b88f885
files
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/views.py	Tue Jul 29 22:17:58 2014 +0200
+++ b/MoinMoin/apps/admin/views.py	Fri Aug 01 12:18:41 2014 +0200
@@ -238,6 +238,7 @@
 
 @admin.route('/trash', defaults=dict(namespace=NAMESPACE_DEFAULT), methods=['GET'])
 @admin.route('/<namespace>/trash')
+@require_permission(SUPERUSER)
 def trash(namespace):
     """
     Returns the trashed items.
--- a/MoinMoin/script/maint/modify_item.py	Tue Jul 29 22:17:58 2014 +0200
+++ b/MoinMoin/script/maint/modify_item.py	Fri Aug 01 12:18:41 2014 +0200
@@ -10,6 +10,7 @@
 
 from flask import current_app as app
 from flask.ext.script import Command, Option
+from flask import g as flaskg
 
 from MoinMoin.constants.keys import CURRENT, ITEMID, REVID, DATAID, SIZE, HASH_ALGORITHM
 
@@ -50,6 +51,7 @@
     )
 
     def run(self, meta_file, data_file, overwrite):
+        flaskg.add_lineno_attr = False
         with open(meta_file, 'rb') as mf:
             meta = mf.read()
         meta = meta.decode('utf-8')