From f64232df3098c4c477fa54de2bc82435563266af Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 31 May 2013 21:34:38 -0500 Subject: [PATCH] change in appadmin auth --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 3 +-- applications/examples/controllers/appadmin.py | 3 +-- applications/welcome/controllers/appadmin.py | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index e060f802..fbc0a77a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.7-stable+timestamp.2013.05.31.21.30.35 +Version 2.4.7-stable+timestamp.2013.05.31.21.33.54 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index b5f77401..07e9163d 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -38,8 +38,7 @@ elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"): raise HTTP(200, T('appadmin is disabled because insecure channel')) if request.function in ('auth_manage','manage') and 'auth' in globals(): - if not auth.has_membership(auth.settings.manager_group_id): - raise HTTP(404) + auth.requires_membership(auth.settings.manager_group_role)(lambda: None)() menu = False elif (request.application == 'admin' and not session.authorized) or \ (request.application != 'admin' and not gluon.fileutils.check_credentials(request)): diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index b5f77401..07e9163d 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -38,8 +38,7 @@ elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"): raise HTTP(200, T('appadmin is disabled because insecure channel')) if request.function in ('auth_manage','manage') and 'auth' in globals(): - if not auth.has_membership(auth.settings.manager_group_id): - raise HTTP(404) + auth.requires_membership(auth.settings.manager_group_role)(lambda: None)() menu = False elif (request.application == 'admin' and not session.authorized) or \ (request.application != 'admin' and not gluon.fileutils.check_credentials(request)): diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index b5f77401..07e9163d 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -38,8 +38,7 @@ elif (remote_addr not in hosts) and (remote_addr != "127.0.0.1"): raise HTTP(200, T('appadmin is disabled because insecure channel')) if request.function in ('auth_manage','manage') and 'auth' in globals(): - if not auth.has_membership(auth.settings.manager_group_id): - raise HTTP(404) + auth.requires_membership(auth.settings.manager_group_role)(lambda: None)() menu = False elif (request.application == 'admin' and not session.authorized) or \ (request.application != 'admin' and not gluon.fileutils.check_credentials(request)):