per-tracker 404 templating

Justus Pendleton · Justus Pendleton · commit 91ef6206e70b · 2007-09-12T01:15:07.000Z
Currently if CGI can't map a name it raises NotFound which gets
propagated up to roundup-server which generates a plain vanilla 404
page.

This changes it so that the CGI client tries to handle NotFound itself
by rendering the appropriate template: classname.404.html (or
_generic.404.html if no class specific one is found). If the URL can't
be mapped to a DB class then we just reraise NotFound and let the
upper layer take care of it.

Also, add some basic templates for it. They aren't pretty but no worse
than what you got before and provide a jumping off point for further
customization.

This should fix [SF#403287].
diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.235 2007-09-11 21:30:14 jpend Exp $
+# $Id: client.py,v 1.236 2007-09-12 01:15:07 jpend Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -323,9 +323,17 @@ def inner_main(self):
             self.template = ''
             self.error_message.append(message)
             self.write_html(self.renderContext())
-        except NotFound:
-            # pass through
-            raise
+        except NotFound, e:
+            self.response_code = 404
+            self.template = '404'
+            try:
+                cl = self.db.getclass(self.classname)
+                self.write_html(self.renderContext())
+            except KeyError:
+                # we can't map the URL to a class we know about
+                # reraise the NotFound and let roundup_server
+                # handle it
+                raise NotFound, e
         except FormError, e:
             self.error_message.append(self._('Form Error: ') + str(e))
             self.write_html(self.renderContext())
diff --git a/templates/classic/html/_generic.404.html b/templates/classic/html/_generic.404.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<title>Item Not Found</title>
+</head>
+
+<body>
+There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
+</body>
+</html>
diff --git a/templates/minimal/html/_generic.404.html b/templates/minimal/html/_generic.404.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<title>Item Not Found</title>
+</head>
+
+<body>
+There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
+</body>
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +<html>
 +<head>
 +<title>Item Not Found</title>
 +</head>
++
 +<body>
 +There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
 +</body>
 +</html>