Changeset 2694 for package_branches/invirt-web

Timestamp:

Dec 20, 2009, 9:45:56 PM (15 years ago)

Author:

broder

Message:

Use contact address from config on error page

Location:

package_branches/invirt-web/cherrypy-rebased/code

Files:

• main.py (modified) (1 diff)
• templates/error.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy-rebased/code/main.py

@@ -77 +77 @@
         d = dict(op = op, user=username, fields=cherrypy.request.prev.params,
                  errorMessage=str(err), stderr=emsg, traceback=traceback)
-        error_raw = cherrypy.tools.mako.callable.get_lookup(**cherrypy.tools.mako._merged_args()).get_template("/error_raw.mako")
+        error_raw = cherrypy.request.lookup.get_template("/error_raw.mako")
         details = error_raw.render(**d)
         exclude = config.web.errormail_exclude

package_branches/invirt-web/cherrypy-rebased/code/templates/error.mako

@@ -9 +9 @@
 mail about it.</p>
 
-<p>Feel free to poke us at <tt>xvm@mit.edu</tt> if this bug is
+<p>Feel free to poke us at <tt>${config.contact}</tt> if this bug is
 consistently biting you and we don't seem to be fixing it.</p>