Changeset 754

Timestamp:

05/09/06 12:30:45 (3 years ago)

Author:

stevegt

Message:

WikiWorkflowPatch:

add IWikiModel extension point

Files:

• wikiworkflowpatch/0.9/wikiworkflowpatch.diff (modified) (12 diffs)

wikiworkflowpatch/0.9/wikiworkflowpatch.diff

@@ -1 +1 @@
-Index: trac/wiki/api.py
-===================================================================
-revision 32
-
-0
+.../vendor/trac-0.9.4)        (revision 25
+.../branches/wikiflowpatch/0.9)       (
+5
-  
-     def get_link_resolvers():
@@ -20 +20 @@
-+        version is the version of text the edit was based on.
-+        """
++
++class IWikiModel(Interface):
++
++    def get_page(name=None, version=None, db=None, latest=None):
++        """Get a WikiPage object."""
-+ 
- class WikiSystem(Component):
@@ -35 +40 @@
-     INDEX_UPDATE_INTERVAL = 5 # seconds
- 
-27
+32
-         else:
-             return '<a class="wiki" href="%s">%s</a>' \
@@ -49 +54 @@
-Index: trac/wiki/web_ui.py
-===================================================================
-revision 32
-
+.../vendor/trac-0.9.4)        (revision 25
+.../branches/wikiflowpatch/0.9)       (
-@@ -30,6 +30,7 @@
- from trac.versioncontrol.diff import get_diff_options, hdf_diff
@@ -59 +64 @@
- from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner
- 
-
+
+
+
+
+
+
+
+
+
+
+
- 
-         add_stylesheet(req, 'common/css/wiki.css')
@@ -79 +94 @@
-                     self._render_editor(req, db, page)
-                 elif req.args.has_key('preview'):
-6
+7
-         elif action == 'delete':
-             self._render_confirm(req, db, page)
@@ -105 +120 @@
-             if req.args.get('format') == 'txt':
-                 req.send_response(200)
-7 +173,7
+13 +174,14
-             req.perm.assert_permission('WIKI_DELETE')
- 
@@ -114 +129 @@
-         version = None
-         if req.args.has_key('version'):
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-         page.save(req.args.get('author'), req.args.get('comment'),
- 
+-
--        req.redirect(self.env.href.wiki(page.name))
++                  req.remote_addr, db=db)
-+        req.redirect(self.env.href.wiki(page.name, version=page.version))
- 
-     def _render_confirm(self, req, db, page):
-         if page.readonly:
-0
+4
-             info['readonly'] = int(req.args.has_key('readonly'))
-         req.hdf['wiki'] = info
@@ -132 +159 @@
-         HDF.
- 
-5
+9
-         req.hdf['title'] = page.name + ' (history)'
- 
@@ -144 +171 @@
-Index: trac/wiki/model.py
-===================================================================
-
-
-
+
+
+
+
+
- from trac.core import *
-
+
+
- 
--
@@ -211 +241 @@
-             cursor = db.cursor()
-             cursor.execute("UPDATE wiki SET readonly=%s WHERE name=%s",
-34
+53
-         self.old_readonly = self.readonly
-         self.old_text = self.text
@@ -243 +273 @@
-+        for controller in WikiSystem(self.env).workflow_controllers:
-+            w = controller.would_collide(req, self.name, self.version)
-t
+T
-+            # True taking precedence over False, and both taking
-great
+soooo nice.
-+            would = would or w  
-+        return would
-+
++class WikiModel(Component):
++    implements(IWikiModel)
++
++    def get_page(self, name=None, version=None, db=None, latest=None):
++        """Get a WikiPage object."""
++        return WikiPage(env=self.env, name=name, version=version,
++                db=db, latest=latest)
++ 
++    def page_count(self, db=None):
++        if not db:
++            db = self.env.get_db_cnx()
++        cursor = db.cursor()
++        cursor.execute("SELECT count(name) FROM wiki")
++        row = cursor.fetchone()
++        if row:
++            count = row[0]
++        else:
++            count = 0
++        return count
-+
-Index: templates/wiki.cs
-===================================================================
-revision 32
-
+.../vendor/trac-0.9.4)        (revision 25
+.../branches/wikiflowpatch/0.9)       (
-@@ -289,6 +289,9 @@
-     if:trac.acl.WIKI_MODIFY ?>