From b87c1c93733506ec59fc326125b68c5b1aad8f70 Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Fri, 20 Feb 2015 12:35:16 +0100 Subject: [PATCH] after logout redirection to organization page handled properly --- ckanext/ozwillo_pyoidc/plugin.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ckanext/ozwillo_pyoidc/plugin.py b/ckanext/ozwillo_pyoidc/plugin.py index 8ad3b3d..1f73baf 100755 --- a/ckanext/ozwillo_pyoidc/plugin.py +++ b/ckanext/ozwillo_pyoidc/plugin.py @@ -85,22 +85,20 @@ class OzwilloPyoidcPlugin(plugins.SingletonPlugin): toolkit.redirect_to('/') def logout(self): + log.info('Logging out user: %s' % session['user']) session['user'] = None - try: - g = model.Group.get(session['organization_id']) - except: - toolkit.redirect_to('/') - else: - session['organization_id'] = None - session.save() - + session.save() + g = model.Group.get(session['organization_id']) + if g: org_url = toolkit.url_for(host=request.host, controller='organization', action='read', id=g.name, qualified=True) - toolkit.redirect_to(org_url) + toolkit.redirect_to(str(org_url)) + else: + toolkit.redirect_to('/') def update_config(self, config_): toolkit.add_template_directory(config_, 'templates')