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 +10 -7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 096b81296d - Show all commits

15
app/views/assiduites.py
View File

@ -1388,12 +1388,15 @@ def tableau_assiduite_actions():
# XXX ca ne va pas car cela ne prend qu'un semestre # XXX ca ne va pas car cela ne prend qu'un semestre
# TODO reprendre le menu de la page ajout_assiduite_etud # TODO reprendre le menu de la page ajout_assiduite_etud
formsemestre = objet.get_formsemestre() formsemestre = objet.get_formsemestre()
if objet.moduleimpl_id is not None: if formsemestre:
module = objet.moduleimpl_id if objet.moduleimpl_id is not None:
elif objet.external_data is not None: module = objet.moduleimpl_id
module = objet.external_data.get("module", "") elif objet.external_data is not None:
module = module.lower() if isinstance(module, str) else module module = objet.external_data.get("module", "")
module = _module_selector(formsemestre, module) module = module.lower() if isinstance(module, str) else module
module = _module_selector(formsemestre, module)
else:
module = "pas de semestre correspondant"
return render_template( return render_template(
"assiduites/pages/tableau_assiduite_actions.j2", "assiduites/pages/tableau_assiduite_actions.j2",

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.68" SCOVERSION = "9.6.69"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"