jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into ScoDoc8

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-01-16 13:18:46 +01:00
commit 390141f145
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZAbsences.py
View File

@ -380,6 +380,7 @@ class ZAbsences(
security.declareProtected(ScoView, "CountAbsJust") security.declareProtected(ScoView, "CountAbsJust")
def CountAbsJust(self, etudid, debut, fin, matin=None, moduleimpl_id=None): def CountAbsJust(self, etudid, debut, fin, matin=None, moduleimpl_id=None):
"Count just. abs"
if matin != None: if matin != None:
matin = _toboolean(matin) matin = _toboolean(matin)
ismatin = " AND A.MATIN = %(matin)s " ismatin = " AND A.MATIN = %(matin)s "

2
ZNotes.py
View File

@ -1077,6 +1077,8 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl
) )
return formsemestre_id return formsemestre_id
security.declareProtected(ScoView, "formsemestre_list")
def formsemestre_list( def formsemestre_list(
self, self,
format=None, format=None,

1
ZScoDoc.py
View File

@ -616,6 +616,7 @@ E. Viennet (Université Paris 13).</p>
security.declareProtected("View", "standard_html_footer") security.declareProtected("View", "standard_html_footer")
def standard_html_footer(self, REQUEST=None): def standard_html_footer(self, REQUEST=None):
"""Le pied de page HTML de la page d'accueil."""
return """<p class="footer"> return """<p class="footer">
Problème de connexion (identifiant, mot de passe): <em>contacter votre responsable ou chef de département</em>.</p> Problème de connexion (identifiant, mot de passe): <em>contacter votre responsable ou chef de département</em>.</p>
<p>Probl&egrave;mes et suggestions sur le logiciel: <a href="mailto:%s">%s</a></p> <p>Probl&egrave;mes et suggestions sur le logiciel: <a href="mailto:%s">%s</a></p>

2
sco_edit_ue.py
View File

@ -779,7 +779,7 @@ def edit_ue_set_code_apogee(context, id=None, value=None, REQUEST=None):
# ---- Table recap formation # ---- Table recap formation
def formation_table_recap(context, formation_id, format="html", REQUEST=None): def formation_table_recap(context, formation_id, format="html", REQUEST=None):
"""""" """Table recapitulant formation."""
F = context.formation_list(args={"formation_id": formation_id}) F = context.formation_list(args={"formation_id": formation_id})
if not F: if not F:
raise ScoValueError("invalid formation_id") raise ScoValueError("invalid formation_id")

2
sco_formsemestre.py
View File

@ -213,6 +213,8 @@ def etapes_apo_str(etapes):
def do_formsemestre_edit(context, sem, cnx=None, **kw): def do_formsemestre_edit(context, sem, cnx=None, **kw):
"""Apply modifications to formsemestre.
Update etapes and resps. Invalidate cache."""
if not cnx: if not cnx:
cnx = context.GetDBConnexion() cnx = context.GetDBConnexion()