changeset 3352:bbc4932e0fa7

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Thu, 20 Mar 2008 16:01:18 +0100
parents 55102b9ed091 (diff) 81697026ee86 (current diff)
children 8e615ef236e2
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/diff.py	Thu Mar 20 15:48:01 2008 +0100
+++ b/MoinMoin/action/diff.py	Thu Mar 20 16:01:18 2008 +0100
@@ -110,7 +110,7 @@
     revlist = currentpage.getRevList()
 
     # Revision list starts from 2...
-    if oldrev == min(revlist) + 1:
+    if oldrev == min(revlist):
         disable_prev = u' disabled="true"'
     else:
         disable_prev = u''
--- a/MoinMoin/action/info.py	Thu Mar 20 15:48:01 2008 +0100
+++ b/MoinMoin/action/info.py	Thu Mar 20 16:01:18 2008 +0100
@@ -146,7 +146,8 @@
                         actions.append(render_action(_('edit'), {'action': 'AttachFile', 'drawing': '%s' % filename.replace(".draw", "")}))
 
                     actions.append(render_action(_('get'), {'action': 'AttachFile', 'do': 'get', 'target': '%s' % filename}))
-                    actions.append(render_action(_('del'), {'action': 'AttachFile', 'do': 'del', 'target': '%s' % filename}))
+                    if request.user.may.delete(pagename):
+                        actions.append(render_action(_('del'), {'action': 'AttachFile', 'do': 'del', 'target': '%s' % filename}))
 
             history.addRow((
                 rev,