Edgewall Software

Ticket #2618: source_patch.txt

File source_patch.txt, 2.2 KB (added by bboisvert@…, 6 years ago)

patch for installed 0.9.5 source to add submitted fields to the HDF on a "mid air collision" error

Line 
1Only in original_trac/scripts: tests
2Only in original_trac/: tests
3Only in original_trac/ticket: tests
4diff -ru original_trac/ticket/web_ui.py trac/ticket/web_ui.py
5--- original_trac/ticket/web_ui.py      2006-04-25 12:23:49.000000000 -0700
6+++ trac/ticket/web_ui.py       2006-04-25 12:09:48.000000000 -0700
7@@ -320,7 +320,7 @@
8         if int(req.args.get('ts')) != ticket.time_changed:
9             raise TracError("Sorry, can not save your changes. "
10                             "This ticket has been modified by someone else "
11-                            "since you started", 'Mid Air Collision')
12+                            "since you started", 'Mid Air Collision', False, req, True)
13
14         # Do any action on the ticket?
15         action = req.args.get('action')
16Only in trac/ticket: web_ui.py.orig
17diff -ru original_trac/util.py trac/util.py
18--- original_trac/util.py       2006-04-25 12:23:49.000000000 -0700
19+++ trac/util.py        2006-04-25 12:09:48.000000000 -0700
20@@ -460,11 +460,13 @@
21
22
23 class TracError(Exception):
24-    def __init__(self, message, title=None, show_traceback=0):
25+    def __init__(self, message, title=None, show_traceback=False, req=None, show_params=False):
26         Exception.__init__(self, message)
27         self.message = message
28         self.title = title
29         self.show_traceback = show_traceback
30+        self.req = req
31+        self.show_params = show_params
32
33
34 class NaivePopen:
35Only in trac/: util.py.orig
36Only in original_trac/versioncontrol: tests
37diff -ru original_trac/web/main.py trac/web/main.py
38--- original_trac/web/main.py   2006-04-25 12:23:49.000000000 -0700
39+++ trac/web/main.py    2006-04-25 12:14:43.000000000 -0700
40@@ -221,6 +221,10 @@
41             req.hdf['error.message'] = e.message
42             if e.show_traceback:
43                 req.hdf['error.traceback'] = tb.getvalue()
44+            if e.req and e.show_params:
45+                req.hdf['error.show_params'] = 1;
46+                for key in e.req.args.keys():
47+                    req.hdf['error.params.' + key] = e.req.args.get(key);
48             req.display('error.cs', response=500)
49
50         elif isinstance(e, PermissionError):
51Only in trac/web: main.py.orig
52Only in trac/web: main.py.rej
53Only in original_trac/web: tests
54Only in original_trac/wiki: tests