diff --git a/VERSION b/VERSION index 397092be..1b0f359e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-24 08:39:47) dev +Version 1.99.7 (2012-04-29 18:49:27) dev diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 1c7e83c1..b8c18dfe 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -1,6 +1,6 @@ /** these MUST stay **/ body { margin: 0; padding:0; border: 0; } -a { text-decoration:none: white-space: nowrap;} +a { text-decoration:none; white-space: nowrap;} a:hover {text-decoration: underline} a.button {text-decoration: none} h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica} diff --git a/gluon/globals.py b/gluon/globals.py index f265c1da..c30df8a7 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -94,6 +94,15 @@ class Request(Storage): self.is_local = False self.global_settings = settings.global_settings + def intargs(self,n,default=None,url_onerror=None): + k = self.args(n) or default + try: + return int(k) + except (ValueError, TypeError): + if url_onerror: + redirect(url_onerror) + raise HTTP(404) + def compute_uuid(self): self.uuid = '%s/%s.%s.%s' % ( self.application,