Changeset 773
- Timestamp:
- 05/19/06 23:37:59 (3 years ago)
- Files:
-
- wikiworkflowpatch/0.9/wikiworkflowpatch.diff (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
wikiworkflowpatch/0.9/wikiworkflowpatch.diff
r763 r773 2 2 =================================================================== 3 3 --- trac/wiki/api.py (.../vendor/trac-0.9.4) (revision 25) 4 +++ trac/wiki/api.py (.../branches/wikiflowpatch/0.9 .4) (working copy)4 +++ trac/wiki/api.py (.../branches/wikiflowpatch/0.9) (working copy) 5 5 @@ -65,16 +65,35 @@ 6 6 … … 55 55 =================================================================== 56 56 --- trac/wiki/web_ui.py (.../vendor/trac-0.9.4) (revision 25) 57 +++ trac/wiki/web_ui.py (.../branches/wikiflowpatch/0.9 .4) (working copy)57 +++ trac/wiki/web_ui.py (.../branches/wikiflowpatch/0.9) (working copy) 58 58 @@ -30,6 +30,7 @@ 59 59 from trac.versioncontrol.diff import get_diff_options, hdf_diff … … 136 136 137 137 if not page.exists: 138 @@ -183,9 +203,1 1@@138 @@ -183,9 +203,12 @@ 139 139 # WIKI_ADMIN 140 140 page.readonly = int(req.args.has_key('readonly')) 141 141 142 + # definitely need to pass db in here, so that change listeners 143 + # can cause rollback 142 + # XXX definitely should pass db in here, so that change listeners 143 + # can cause rollback in case they blow up; can't do that unless 144 + # we later do a db.commit() somewhere though 144 145 page.save(req.args.get('author'), req.args.get('comment'), 145 -req.remote_addr)146 req.remote_addr) 146 147 - req.redirect(self.env.href.wiki(page.name)) 147 + req.remote_addr, db=db)148 148 + req.redirect(self.env.href.wiki(page.name, version=page.version)) 149 149 150 150 def _render_confirm(self, req, db, page): 151 151 if page.readonly: 152 @@ -312,7 +33 4,7 @@152 @@ -312,7 +335,7 @@ 153 153 info['readonly'] = int(req.args.has_key('readonly')) 154 154 req.hdf['wiki'] = info … … 159 159 HDF. 160 160 161 @@ -327,7 +3 49,8 @@161 @@ -327,7 +350,8 @@ 162 162 req.hdf['title'] = page.name + ' (history)' 163 163 … … 172 172 =================================================================== 173 173 --- trac/wiki/model.py (.../vendor/trac-0.9.4) (revision 25) 174 +++ trac/wiki/model.py (.../branches/wikiflowpatch/0.9 .4) (working copy)174 +++ trac/wiki/model.py (.../branches/wikiflowpatch/0.9) (working copy) 175 175 @@ -20,17 +20,17 @@ 176 176 import time … … 302 302 =================================================================== 303 303 --- trac/web/api.py (.../vendor/trac-0.9.4) (revision 25) 304 +++ trac/web/api.py (.../branches/wikiflowpatch/0.9 .4) (working copy)304 +++ trac/web/api.py (.../branches/wikiflowpatch/0.9) (working copy) 305 305 @@ -240,7 +240,16 @@ 306 306 simply send the response itself and not return anything. … … 323 323 =================================================================== 324 324 --- trac/web/main.py (.../vendor/trac-0.9.4) (revision 25) 325 +++ trac/web/main.py (.../branches/wikiflowpatch/0.9 .4) (working copy)325 +++ trac/web/main.py (.../branches/wikiflowpatch/0.9) (working copy) 326 326 @@ -23,7 +23,7 @@ 327 327 from trac.perm import PermissionCache, PermissionError … … 355 355 =================================================================== 356 356 --- templates/wiki.cs (.../vendor/trac-0.9.4) (revision 25) 357 +++ templates/wiki.cs (.../branches/wikiflowpatch/0.9 .4) (working copy)357 +++ templates/wiki.cs (.../branches/wikiflowpatch/0.9) (working copy) 358 358 @@ -289,6 +289,9 @@ 359 359 if:trac.acl.WIKI_MODIFY ?>
