diff --git a/VERSION b/VERSION index 40284402..b6ce7d75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.4-stable+timestamp.2013.09.23.16.32.10 +Version 2.6.4-stable+timestamp.2013.09.24.13.29.22 diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 4c3c1ee1..5eaa8fb4 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -494,6 +494,7 @@ def enable(): if is_gae: return SPAN(T('Not supported'), _style='color:yellow') elif os.path.exists(filename): + os.unlink(filename) return SPAN(T('Disable'), _style='color:green') else: safe_open(filename, 'wb').write('disabled: True\ntime-disabled: %s' % request.now) diff --git a/applications/admin/views/default/site.html b/applications/admin/views/default/site.html index f1051c16..495b47d9 100644 --- a/applications/admin/views/default/site.html +++ b/applications/admin/views/default/site.html @@ -54,7 +54,7 @@ {{pass}} - {{=button_enable(URL('enable',args=a), a)}} + {{=button_enable(URL('enable',args=a), a) if a!='admin' else ''}} {{pass}} diff --git a/gluon/main.py b/gluon/main.py index 3ffb139b..5b5b97e4 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -396,15 +396,8 @@ def wsgibase(environ, responder): raise HTTP(404, rwthread.routes.error_message % 'invalid request', web2py_error='invalid application') - elif request.is_local and exists(disabled): - data = dict([item.strip() for item in line.split(':',1)] - for line in open(disabled) if line.strip()) - if data.get('disabled','True').lower() != 'false': - if 'redirect' in data: - redirect(data['redirect']) - if 'message' in data: - raise HTTP(503, data['message']) - raise HTTP(503, "

Temporarily down for maintenance

") + elif not request.is_local and exists(disabled): + raise HTTP(503, "

Temporarily down for maintenance

") # ################################################## # build missing folders