From 4f3c2120e0e6dafb0ebb6718bf5e537e19b06677 Mon Sep 17 00:00:00 2001
From: Vincent Le Gallic
Date: Fri, 28 Feb 2014 08:14:39 +0100
Subject: [PATCH] [wiki/macro] On n'affiche pas les acl vides ni les pages
moinmoin
---
wiki/macro/AllPagesWithACL.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/wiki/macro/AllPagesWithACL.py b/wiki/macro/AllPagesWithACL.py
index dd3c48f1..8fc04e9f 100644
--- a/wiki/macro/AllPagesWithACL.py
+++ b/wiki/macro/AllPagesWithACL.py
@@ -7,6 +7,12 @@
changes:
12.2007 - conversion to new syntax by Bolesław Kulbabiński
+
+ Modifié par Vincent Le Galli
+ (cf http://moinmo.in/MacroMarket/1.6_AdminTools)
+ * patch pour ne pas afficher les acl "not defined"
+ * Si on fournit le paramètre IncludeSystemPages, on a aussi les pages MoinMoin,
+ mais par défaut, non.
"""
import os
@@ -31,13 +37,15 @@ def macro_AllPagesWithACL(macro, args):
html += "Total: %s pages
" % str(len(pages))
for pagename in pages:
- all[Page(macro.request, pagename).link_to(macro.request)] = getAcl(macro.request, pagename)
+ if Page(macro.request,pagename).isStandardPage() or (args != None and "IncludeSystemPages" in args):
+ all[Page(macro.request, pagename).link_to(macro.request)] = getAcl(macro.request, pagename)
html += ""
all1 = sorted(all.items())
for pg, ac in all1:
- html += "%s | " % pg
- html += "%s |
" % ac
+ if ac != "not defined":
+ html += "%s | " % pg
+ html += "%s |
" % ac
html += "
"
return macro.formatter.rawHTML(html)