From e57adcf0f6b7f39b59dafa548f6ac9ef984695bd Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Thu, 8 Mar 2018 14:35:11 +0100 Subject: [PATCH] replace authenticated_userid from security by request.authenticated_userid --- mondumas.egg-info/PKG-INFO | 1 + mondumas.egg-info/SOURCES.txt | 1 + mondumas.egg-info/requires.txt | 2 +- mondumas/layout.py | 9 ++++----- mondumas/panels.py | 3 +-- mondumas/templates/agenda/planning.pt | 4 ++-- mondumas/templates/user_edit.pt | 4 ++-- mondumas/views/agenda.py | 9 ++------- mondumas/views/default.py | 3 +-- 9 files changed, 15 insertions(+), 21 deletions(-) diff --git a/mondumas.egg-info/PKG-INFO b/mondumas.egg-info/PKG-INFO index b7ffbf3..8ce1e45 100644 --- a/mondumas.egg-info/PKG-INFO +++ b/mondumas.egg-info/PKG-INFO @@ -6,6 +6,7 @@ Home-page: UNKNOWN Author: UNKNOWN Author-email: UNKNOWN License: UNKNOWN +Description-Content-Type: UNKNOWN Description: # README # diff --git a/mondumas.egg-info/SOURCES.txt b/mondumas.egg-info/SOURCES.txt index a6aabca..1b3bb94 100644 --- a/mondumas.egg-info/SOURCES.txt +++ b/mondumas.egg-info/SOURCES.txt @@ -1,5 +1,6 @@ CHANGES.txt MANIFEST.in +README.md development.ini production.ini pytest.ini diff --git a/mondumas.egg-info/requires.txt b/mondumas.egg-info/requires.txt index 8fd488d..489c70e 100644 --- a/mondumas.egg-info/requires.txt +++ b/mondumas.egg-info/requires.txt @@ -11,6 +11,6 @@ waitress MySQL-python [testing] -WebTest >= 1.3.1 +WebTest>=1.3.1 pytest pytest-cov diff --git a/mondumas/layout.py b/mondumas/layout.py index 3c71bf4..d4301af 100644 --- a/mondumas/layout.py +++ b/mondumas/layout.py @@ -2,10 +2,9 @@ from pyramid_layout.layout import layout_config from views.default import ( to_euro, - to_percent, - to_decimal, + to_percent, + to_decimal, ) -from pyramid.security import authenticated_userid @layout_config(template='templates/layouts/global_layout.pt') class GlobalLayout(object): @@ -26,11 +25,11 @@ class GlobalLayout(object): return to_percent(x) def isAnonymous(self): - user = authenticated_userid(self.request) + user = self.request.authenticated_userid return user is None def isAdmin(self): - logged_in = authenticated_userid(self.request) + logged_in = self.request.authenticated_userid is_admin = False if logged_in is not None: groups = groupfinder(logged_in, self.request) diff --git a/mondumas/panels.py b/mondumas/panels.py index f2236cc..a93e67c 100644 --- a/mondumas/panels.py +++ b/mondumas/panels.py @@ -1,13 +1,12 @@ # -*- coding: utf8 -*- from pyramid_layout.panel import panel_config -from pyramid.security import authenticated_userid from .security import groupfinder from .models.default import get_member_by_id @panel_config(name='dropdown_menu_panel', renderer='templates/panels/dropdown_menu_panel.pt') def dropdown_menu_panel(context, request): - logged_in = authenticated_userid(request) + logged_in = request.authenticated_userid if logged_in is None: return { 'logged_in': '' } else: diff --git a/mondumas/templates/agenda/planning.pt b/mondumas/templates/agenda/planning.pt index 9d74f87..8ad4078 100644 --- a/mondumas/templates/agenda/planning.pt +++ b/mondumas/templates/agenda/planning.pt @@ -11,9 +11,9 @@
diff --git a/mondumas/templates/user_edit.pt b/mondumas/templates/user_edit.pt index 94c209b..bda32b7 100644 --- a/mondumas/templates/user_edit.pt +++ b/mondumas/templates/user_edit.pt @@ -47,9 +47,9 @@
diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py index 8695613..42bd694 100644 --- a/mondumas/views/agenda.py +++ b/mondumas/views/agenda.py @@ -5,11 +5,6 @@ from pyramid.view import ( view_config, forbidden_view_config, ) -from pyramid.security import ( - authenticated_userid, - remember, - forget, -) from pyramid.httpexceptions import ( HTTPFound, HTTPNotFound, @@ -100,7 +95,7 @@ def dossier_view(request): @view_config(route_name='agenda', renderer='../templates/agenda/agenda.pt', permission='view') def agenda(request): - logged_in = authenticated_userid(request) + logged_in = request.authenticated_userid member = get_member_by_id(request, logged_in) if not member: request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger') @@ -144,7 +139,7 @@ def agenda(request): @view_config(route_name='planning', renderer='../templates/agenda/planning.pt', permission='view') def planning(request): - logged_in = authenticated_userid(request) + logged_in = request.authenticated_userid member = get_member_by_id(request, logged_in) if not member: request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger') diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 040c859..4b62b95 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -6,7 +6,6 @@ from pyramid.view import ( forbidden_view_config, ) from pyramid.security import ( - authenticated_userid, remember, forget, ) @@ -93,7 +92,7 @@ Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser vot @view_config(route_name='changer_mdp', renderer='../templates/changer_mdp.pt', permission='view') def changer_mdp(request): url = request.route_url('changer_mdp') - logged_in = authenticated_userid(request) + logged_in = request.authenticated_userid message = '' member = get_member_by_id(request, logged_in)