Changeset 2936 for trac/trunk/wiki-macros/TracNav.py

Timestamp:

03/24/05 19:10:29 (8 years ago)

Author:

hauma

Message:

• If a TOC page contains a call to TracNav with itself as argument, use the currently edited version of TOC in the preview of the navigation bar. Disable the edit button in preview mode.

File:

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

trac/trunk/wiki-macros/TracNav.py

@@ -77 +77 @@
 listRule = re.compile(r"""^(?P<indent> *)\* +(?:(?P<wikilink>\[wiki:(?P<link>(&#34;([^&#34;]*)&#34;|'([^']*)')|([^ \]]+)) +(?P<label>[^\]]*)\])|(?P<text>.*))""", re.M)
 
-def getToc(env, db, name):
-    cursor = db.cursor()
-    cursor.execute('SELECT text FROM wiki WHERE name=%s ORDER BY version DESC LIMIT 1', name)
-    row = cursor.fetchone()
-    if not row:
-        return None
-
-    tocText = row[0]
+def getToc(hdf, env, db, curpage, name):
+    preview = hdf.getValue('args.preview', "")
+
+    tocText = "* Table of contents"
+    if preview and (name == curpage):
+        tocText = hdf.getValue('wiki.page_source', tocText);
+    else:
+        cursor = db.cursor()
+        cursor.execute('SELECT text FROM wiki WHERE name=%s ORDER BY version DESC LIMIT 1', name)
+        row = cursor.fetchone()
+        if row:
+            tocText = row[0]
 
     # env.log.debug(tocText)
-
+    return tocText
+
+
+def parseToc(tocText):
     stack = []
     nextPos = 0
@@ -141 +148 @@
 
 def execute(hdf, args, env):
-    curpage =  '%s' % hdf.getValue('args.page', '')
+    preview = hdf.getValue('args.preview', "")
+    curpage = hdf.getValue('args.page', "")
     name = args
     if not name:
@@ -147 +155 @@
 
     db = env.get_db_cnx()
-    toc = getToc(env, db, name)
+    toc = parseToc(getToc(hdf, env, db, curpage, name))
     if not toc:
         msg = ''
         msg += '<div class="system-message"><strong>Error: Table of contents does not exist.'
-        if (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
+        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'
@@ -189 +197 @@
 
 def displayAll(hdf, env, name, curpage, toc, col):
+    preview = hdf.getValue('args.preview', "")
     html = ''
     html += '%s<div class="wiki-toc trac-nav">\n' % indentation(col)
     col += 1
-    if hdf.getValue('trac.acl.WIKI_MODIFY', ''):
+    if (not preview) and hdf.getValue('trac.acl.WIKI_MODIFY', ''):
         html += '%s<div class="edit"><a href="%s?edit=yes">edit</a></div>\n' % (indentation(col), env.href.wiki(name))
     html += '%s<ul>\n' % indentation(col)