opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c0ac1ab48 - Show all commits

10
app/views/users.py
View File

@ -488,7 +488,8 @@ def create_user_form(user_name=None, edit=0, all_roles=True):
},
),
]
# Si SuperAdmin, propose de choisir librement le dept du nouvel utilisateur
# Si on a le droit d'administrer les utilisateurs de plusieurs départements,
# propose le choix du dept du nouvel utilisateur
selectable_dept_acronyms = set(administrable_dept_acronyms)
if edit:
if the_user.dept is not None: # ajoute dept actuel de l'utilisateur
@ -500,7 +501,7 @@ def create_user_form(user_name=None, edit=0, all_roles=True):
if g.scodoc_dept in selectable_dept_acronyms
else (auth_dept or "")
)
if is_super_admin and len(selectable_dept_acronyms) > 1:
if len(selectable_dept_acronyms) > 1:
selectable_dept_acronyms = sorted(list(selectable_dept_acronyms))
descr.append(
(
@ -685,9 +686,8 @@ def create_user_form(user_name=None, edit=0, all_roles=True):
if "status" in vals:
vals["active"] = vals["status"] == ""
# Département:
if auth_dept: # pas super-admin
if ("dept" in vals) and (vals["dept"] not in selectable_dept_acronyms):
del vals["dept"] # ne change pas de dept
if ("dept" in vals) and (vals["dept"] not in selectable_dept_acronyms):
del vals["dept"] # ne change pas de dept
# Traitement des roles: ne doit pas affecter les rôles
# que l'on en contrôle pas:
for role in orig_roles_strings: # { "Ens_RT", "Secr_CJ", ... }