Mercurial > p > roundup > code
changeset 3495:d92844be9612 maint-0.8
merge from HEAD;
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Wed, 25 Jan 2006 03:01:51 +0000 |
| parents | e7215bd7045d |
| children | 897ac2dab754 |
| files | CHANGES.txt roundup/cgi/client.py |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.txt Wed Jan 25 02:27:44 2006 +0000 +++ b/CHANGES.txt Wed Jan 25 03:01:51 2006 +0000 @@ -17,6 +17,7 @@ - fix permission check on RetireAction (sf bug 1407342) - timezone now applied to date for pretty-format (sf bug 1406861) - fix mangling of "_" in mail Subject class name (sf bug 1413852) +- catch bad classname in URL (related to sf bug 1240541) 2005-10-07 0.8.5
--- a/roundup/cgi/client.py Wed Jan 25 02:27:44 2006 +0000 +++ b/roundup/cgi/client.py Wed Jan 25 03:01:51 2006 +0000 @@ -1,4 +1,4 @@ -# $Id: client.py,v 1.211.2.4 2005-07-18 02:20:13 richard Exp $ +# $Id: client.py,v 1.211.2.5 2006-01-25 03:01:51 richard Exp $ """WWW request handler (also used in the stand-alone server). """ @@ -563,7 +563,11 @@ if m: self.classname = m.group(1) self.nodeid = m.group(2) - if not self.db.getclass(self.classname).hasnode(self.nodeid): + try: + klass = self.db.getclass(self.classname) + except KeyError: + raise NotFound, '%s/%s'%(self.classname, self.nodeid) + if not klass.hasnode(self.nodeid): raise NotFound, '%s/%s'%(self.classname, self.nodeid) # with a designator, we default to item view self.template = 'item'