diff --git a/applications/examples/controllers/simple_examples.py b/applications/examples/controllers/simple_examples.py index 58a74ec2..2af52f2b 100644 --- a/applications/examples/controllers/simple_examples.py +++ b/applications/examples/controllers/simple_examples.py @@ -35,12 +35,6 @@ def hello6(): response.flash = 'Hello World in a flash!' return dict(message=T('Hello World')) - -def status(): - """ page that shows internal status""" - return dict(toolbar=response.toolbar()) - - def redirectme(): """ redirects to /{{=request.application}}/{{=request.controller}}/hello3 """ diff --git a/applications/examples/views/default/examples.html b/applications/examples/views/default/examples.html index 9debd288..2b07c755 100644 --- a/applications/examples/views/default/examples.html +++ b/applications/examples/views/default/examples.html @@ -94,7 +94,6 @@ def status(): return dict(toobar=response.toolbar()) """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}

Here we are showing the request, session and response objects using the generic.html template. -
Try it here: status

Example {{=c}}{{c+=1}}

In controller: simple_examples.py {{=CODE(""" diff --git a/applications/examples/views/simple_examples/status.html b/applications/examples/views/simple_examples/status.html deleted file mode 100644 index 05184e84..00000000 --- a/applications/examples/views/simple_examples/status.html +++ /dev/null @@ -1,3 +0,0 @@ -{{extend 'layout.html'}} - -{{=toolbar}} diff --git a/gluon/globals.py b/gluon/globals.py index 45d60700..854bf089 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -812,7 +812,7 @@ class Session(Storage): response.session_data_name = 'session_data_%s' % masterapp.lower() response.session_cookie_expires = cookie_expires response.session_client = str(request.client).replace(':', '.') - response.session_cookie_key = cookie_key + current._session_cookie_key = cookie_key response.session_cookie_compression_level = compression_level # check if there is a session_id in cookies @@ -1065,7 +1065,7 @@ class Session(Storage): # if not cookie_key, but session_data_name in cookies # expire session_data_name from cookies - if not response.session_cookie_key: + if not current._session_cookie_key: if response.session_data_name in cookies: rcookies[response.session_data_name] = 'expired' rcookies[response.session_data_name]['path'] = '/' @@ -1128,7 +1128,7 @@ class Session(Storage): name = response.session_data_name compression_level = response.session_cookie_compression_level value = secure_dumps(dict(self), - response.session_cookie_key, + current._session_cookie_key, compression_level=compression_level) rcookies = response.cookies rcookies.pop(name, None)