replace authenticated_userid from security by request.authenticated_userid

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 #
         
         

mondumas.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 CHANGES.txt
 MANIFEST.in
+README.md
 development.ini
 production.ini
 pytest.ini

mondumas.egg-info/requires.txt

@@ -11,6 +11,6 @@ waitress
 MySQL-python
 
 [testing]
-WebTest >= 1.3.1
+WebTest>=1.3.1
 pytest
 pytest-cov

mondumas/layout.py

@@ -2,10 +2,9 @@
 from pyramid_layout.layout import layout_config
 from views.default import (
     to_euro,
-                                 to_percent,
+    to_percent,
-                                 to_decimal,
+    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)

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:

mondumas/templates/agenda/planning.pt

@@ -11,9 +11,9 @@
 			<form method="POST" id="frm">
 				<div class="col-md-3" tal:condition="access >= 5">
 					<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()">
-						<optgroup tal:repeat="item agendas">
+						<div tal:repeat="item agendas">
 							<option value="${item.CD_UTI}" tal:attributes="selected agenda==item.CD_UTI and 'selected' or None">${item.NOM}</option>
-						</optgroup>
+						</div>
 					</select>
 				</div>
 				<div class="col-md-3" tal:condition="access < 5">

mondumas/templates/user_edit.pt

@@ -47,9 +47,9 @@
 				<label class="control-label col-xs-2" for="access">Accès</label>
 				<div class="col-xs-2">
 					<select class="form-control" id="access" name="access">
-						<optgroup tal:repeat="item access">
+						<div tal:repeat="item access">
 							<option value="${item}" tal:attributes="selected str(individu.access)==item[0] and 'selected' or None">${item}</option>
-						</optgroup>
+						</div>
 					</select>
 				</div>
 			</div>

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')

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)