ositah 24.9.dev5__tar.gz → 24.9.dev6__tar.gz

{ositah-24.9.dev5/ositah.egg-info → ositah-24.9.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev5
+Version: 24.9.dev6
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

{ositah-24.9.dev5 → ositah-24.9.dev6}/ositah/main.py

@@ -192,7 +192,7 @@ def render_page_content(pathname, login_menu):
 
     if user_authenticated:
         user_session_data = global_params.session_data
-        user = get_agent_by_email(session["user_email"])
+        user = get_agent_by_email()
         role_ok = False
         user_roles = user.roles
         for role in AUTHORIZED_ROLES:
@@ -216,7 +216,7 @@ def render_page_content(pathname, login_menu):
                     else:
                         teams.extend(
                             Team.query.filter(
-                                Team.children_managers.any(email_auth=session["user_email"])
+                                Team.children_managers.any(email=session["user_email"])
                             ).all()
                         )
                         team_list = sorted([t.nom for t in teams])

{ositah-24.9.dev5 → ositah-24.9.dev6}/ositah/utils/agents.py

@@ -12,18 +12,20 @@ NSIP_AGENT_COLUMNS = {
 }
 
 
-def get_agent_by_email(connexion_email: str) -> str:
+def get_agent_by_email(agent_email: str = None) -> str:
     """
-    Retrieve an agent from Hito using the connexion email. If the connexion email is not
-    defined for the agent, try to use the contact email.
+    Retrieve an agent from Hito using his email. If the agent email argument
+    is not present, use the session user_email attribute.
 
-    :param connexion_email: agent's email
+    :param: agent_email: agent's email
     :return: agent entry (row)
     """
 
     from ositah.utils.hito_db_model import Agent
 
-    user = Agent.query.filter_by(email_auth=session["user_email"]).first()
+    if agent_email is None:
+        agent_email = session["user_email"]
+    user = Agent.query.filter_by(email_auth=agent_email).first()
     if user is None:
         user = Agent.query.filter_by(email=session["user_email"]).first()
 

{ositah-24.9.dev5 → ositah-24.9.dev6/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.9.dev5
+Version: 24.9.dev6
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

{ositah-24.9.dev5 → ositah-24.9.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.9.dev5"
+version = "24.9.dev6"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.9"