Changeset 3063 for trac

Timestamp:

12/02/05 00:31:58 (7 years ago)

Author:

moschny

Message:

• Allow usage of the Image macro in toc entries. Note: References to local attachments (a single argument without colon) cannot be used currently (the Image macro needs the a reference to the request in that case, which we don't have.)

• Bugfix: Show the submitted version of the toc, when previewing the toc page itself (broken since transition to trac 0.9).

• Don't display the big fat error message anymore.

File:

• trac/trunk/wiki-macros/TracNav.py (modified) (3 diffs)

trac/trunk/wiki-macros/TracNav.py

@@ -75 +75 @@
 from trac.wiki.api import WikiSystem
 from trac.wiki.model import WikiPage
-from trac.wiki.formatter import OneLinerFormatter
+from trac.wiki.formatter import Formatter, OneLinerFormatter
 from StringIO import StringIO
 
 TRACNAVHOME = "http://svn.ipd.uka.de/trac/javaparty/wiki/TracNav"
 LISTRULE = re.compile(r"^(?P<indent> +)\* +(?P<rest>.*)$", re.M)
-
-def get_toc(hdf, env, curpage, name):
+ALLOWED_MACROS = ["image"]
+
+def get_toc(hdf, env, preview, name):
     """
     Fetch the wiki page containing the toc, if available.
     """
-    toc_text = " * Table of contents"
-
-    preview = hdf.getValue('args.preview', "")
-    if preview and (name == curpage):
-        toc_text = hdf.getValue('wiki.page_source', toc_text);
-    elif WikiSystem(env).has_page(name):
-        toc_text = WikiPage(env, name).text
-    return toc_text
+    if preview:
+        cur_path = hdf.getValue('HTTP.PathInfo', '')
+        toc_path = "/wiki/" + name
+        if cur_path == toc_path:
+            return hdf.getValue('args.text', '')
+
+    if WikiSystem(env).has_page(name):
+        return WikiPage(env, name).text
+    else:
+        return ''
 
 
@@ -115 +118 @@
         return OneLinerFormatter._make_link(
             self, namespace, target, match, label)
+
+    def _macro_formatter(self, match, fullmatch):
+        name = fullmatch.group('macroname').lower()
+        if name == 'br':
+            return ' '
+        elif name in ALLOWED_MACROS:
+            # leapfrog the OneLinerFormatter
+            return Formatter._macro_formatter(self, match, fullmatch)
+        else:
+            return ''
 
     # FIXME: what about _make_relative_link() ?
@@ -181 +194 @@
     Main routine of the wiki macro.
     """
+    #env.log.debug("hdf: %s", hdf)
     preview = hdf.getValue('args.preview', "")
     curpage = hdf.getValue('wiki.page_name', "")
     name = args or 'TOC'
 
-    toc = parse_toc(get_toc(hdf, env, curpage, name), env)
+    toc = parse_toc(get_toc(hdf, env, preview, name), env)
     if not toc:
-        msg = '<div class="system-message">' \
-              "<strong>Error: Table of contents does not exist or is empty."
-        if (not preview) and (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
-            msg += ' Click here to <a href="%s?edit=yes">edit</a>.' % \
-                   env.href.wiki(name)
-        msg += '</strong></div>\n'
-        return msg
+        toc = parse_toc(' * TOC "%s" is empty!' % name, env)
 
     (found, filtered) = filter_toc(curpage, toc, 0)