Changeset 3000

Timestamp:

06/03/05 16:03:52 (8 years ago)

Author:

moschny

Message:

Imported ​http://svn.swapoff.org/trachacks/file/trunk/macros/AddComment.py?rev=31&format=raw .

File:

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

trac/trunk/wiki-macros/AddComment.py

@@ -1 +1 @@
 # vim: expandtab
-from trac.Wiki import WikiPage
+
 import trac.perm
 import time
 from StringIO import StringIO
-from trac.WikiFormatter import wiki_to_html
+from trac.wiki.formatter import wiki_to_html
+from trac.wiki.model import WikiPage
 from trac.util import TracError
 import re
 
 def execute(hdf, args, env):
+    # prevents from multiple inclusions
+    if hdf.has_key('addcommentmacro'):
+       raise TracError('\'AddComment\' macro cannot be included twice')
+    hdf['addcommentmacro'] = True
+
     authname = hdf.getValue("trac.authname", "anonymous")
     db = env.get_db_cnx()
     perm = trac.perm.PermissionCache(db, authname)
-    pagename = hdf.getValue("args.page", "WikiStart")
-    page = WikiPage(pagename, None, perm, db)
-    wikipreview = hdf.getValue("args.preview", "")
+    pagename = hdf.getValue("wiki.page_name", "WikiStart")
+    page = WikiPage(env, pagename, None, db)
+    wikipreview = hdf.getValue("wiki.preview", "")
     appendonly = (args == 'appendonly')
     readonlypage = int(hdf.getValue("wiki.readonly", "0"))
@@ -27 +33 @@
 
     disabled = ''
+    print dir(hdf)
+
     comment = hdf.getValue("args.addcomment", "")
     preview = hdf.getValue("args.previewaddcomment", "")
@@ -64 +72 @@
             if appendonly:
                 perm.expand_meta_permission('WIKI_ADMIN');
-            page.set_content(newtext.getvalue())
             # TODO: How do we get remote_addr from a macro?
-            page.commit(authname, 'Comment added', None)
+            page.text = newtext.getvalue()
+            page.save(authname, 'Comment added', None)
             comment = ""
         else:
@@ -86 +94 @@
     out.write("<script type='text/javascript'>\naddWikiFormattingToolbar(document.getElementById('addcomment'));\n</script>\n")
     out.write("</fieldset>\n</form>\n")
+
     return out.getvalue()# + "<pre>" + hdf.dump() + "</pre>"