Changeset 3038 for trac

Timestamp:

10/27/05 18:50:34 (8 years ago)

Author:

moschny

Message:

Import of ​http://trac-hacks.swapoff.org/browser/addcommentmacro/0.9/AddComment.py?format=raw .

File:

• trac/trunk/wiki-macros/AddComment.py (modified) (9 diffs)

trac/trunk/wiki-macros/AddComment.py

@@ -7 +7 @@
 from trac.wiki.model import WikiPage
 from trac.util import TracError
+from trac.web.chrome import add_link
 import re
 
@@ -17 +18 @@
     authname = hdf.getValue("trac.authname", "anonymous")
     db = env.get_db_cnx()
-    perm = trac.perm.PermissionCache(db, authname)
+    perm = trac.perm.PermissionCache(env, authname)
     pagename = hdf.getValue("wiki.page_name", "WikiStart")
     page = WikiPage(env, pagename, None, db)
@@ -26 +27 @@
     cancomment = not readonlypage
     # Is this an "append-only" comment or are we an administrator?
-    if perm.has_permission(trac.perm.WIKI_ADMIN) or appendonly:
+    if perm.has_permission('WIKI_ADMIN') or appendonly:
         cancomment = True
 
@@ -33 +34 @@
 
     disabled = ''
-    print dir(hdf)
 
     comment = hdf.getValue("args.addcomment", "")
@@ -47 +47 @@
 
     out = StringIO()
-    if wikipreview or not perm.has_permission(trac.perm.WIKI_MODIFY):
+    if wikipreview or not (perm.has_permission('WIKI_MODIFY') or appendonly):
         disabled = ' disabled="disabled"'
 
@@ -54 +54 @@
         if preview:
             out.write("<div class='wikipage' id='preview'>\n")
-        out.write("<h4 id='commentpreview'>Comment by %s on %s</h4>\n<p>\n%s\n</p>\n" % (authname, time.strftime('%c', time.localtime()), wiki_to_html(comment, hdf, env, db)))
+        out.write("<h4 id='commentpreview'>Comment by %s on %s</h4>\n<p>\n%s\n</p>\n" % (authname, time.strftime('%c', time.localtime()), wiki_to_html(comment, env, None)))
         if preview:
             out.write("</div>\n")
@@ -68 +68 @@
             newtext.write(line + "\n")
         if submitted:
-            # XXX Is this the dodigest hack ever? This is needed in 
+            # XXX Is this the dodgiest hack ever? This is needed in 
             # "appendonly" mode when the page is readonly. XXX
-            if appendonly:
-                perm.expand_meta_permission('WIKI_ADMIN');
+#            if appendonly:
+#                perm.expand_meta_permission('WIKI_ADMIN');
             # TODO: How do we get remote_addr from a macro?
             page.text = newtext.getvalue()
@@ -79 +79 @@
             out.write("<div class='system-message'><strong>ERROR: [[AddComment]] macro call must be the only content on its line. Could not add comment.</strong></div>\n")
 
-    out.write("<form action='%s#commentpreview' method='post'>\n" % env.href.wiki(pagename))
+    out.write("<form action='%s#commentpreview' method='get'>\n" % env.href.wiki(pagename))
     out.write("<fieldset>\n<legend>Add comment</legend>\n")
     out.write("<div class='field'>\n<textarea id='addcomment' name='addcomment' cols='80' rows='5'%s>" % disabled)
@@ -92 +92 @@
     out.write("<input type='submit' name='previewaddcomment' value='Preview comment'%s/>\n" % disabled)
     out.write("<input type='submit' name='canceladdcomment' value='Cancel'%s/>\n</div>\n" % disabled)
+    out.write('<script type="text/javascript" src="%sjs/wikitoolbar.js"></script>' % hdf['htdocs_location'])
     out.write("<script type='text/javascript'>\naddWikiFormattingToolbar(document.getElementById('addcomment'));\n</script>\n")
     out.write("</fieldset>\n</form>\n")