From 31288efb7365c398171c4806a5184cbf2766204a Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Thu, 29 Jul 2021 17:58:18 +0300 Subject: [PATCH] bug fix --- app/scodoc/sco_bulletins.py | 2 -- app/scodoc/sco_find_etud.py | 2 -- app/scodoc/sco_permissions_check.py | 4 +--- app/views/absences.py | 16 +++------------- app/views/notes.py | 18 +++++------------- 5 files changed, 9 insertions(+), 33 deletions(-) diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index f7ba8648c..bb7c9f851 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -1031,9 +1031,7 @@ def _formsemestre_bulletinetud_header_html( uid = str(authuser) H = [ html_sco_header.sco_header( - context, page_title="Bulletin de %(nomprenom)s" % etud, - REQUEST=REQUEST, javascripts=[ "js/bulletin.js", "libjs/d3.v3.min.js", diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py index dda5a5877..ddfa6b82d 100644 --- a/app/scodoc/sco_find_etud.py +++ b/app/scodoc/sco_find_etud.py @@ -124,12 +124,10 @@ def search_etud_in_dept(context, expnom="", REQUEST=None): H = [ html_sco_header.sco_header( - context, page_title="Recherche d'un étudiant", no_side_bar=True, init_qtip=True, javascripts=["js/etud_info.js"], - REQUEST=REQUEST, ), """

%d résultats pour "%s": choisissez un étudiant:

""" % (len(etuds), expnom), diff --git a/app/scodoc/sco_permissions_check.py b/app/scodoc/sco_permissions_check.py index 6a4010d60..ccc948749 100644 --- a/app/scodoc/sco_permissions_check.py +++ b/app/scodoc/sco_permissions_check.py @@ -148,9 +148,7 @@ def check_access_diretud( from app.scodoc import sco_formsemestre sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - header = html_sco_header.sco_header( - context, page_title="Accès interdit", REQUEST=REQUEST - ) + header = html_sco_header.sco_header(page_title="Accès interdit") footer = html_sco_header.sco_footer() if ( current_user.user_name not in sem["responsables"] diff --git a/app/views/absences.py b/app/views/absences.py index 228569630..5b9812016 100644 --- a/app/views/absences.py +++ b/app/views/absences.py @@ -323,9 +323,7 @@ def SignaleAbsenceGrHebdo( ) if not groups_infos.members: return ( - html_sco_header.sco_header( - context, page_title="Saisie des absences", REQUEST=REQUEST - ) + html_sco_header.sco_header(page_title="Saisie des absences") + "

Aucun étudiant !

" + html_sco_header.sco_footer() ) @@ -492,9 +490,7 @@ def SignaleAbsenceGrSemestre( ) if not groups_infos.members: return ( - html_sco_header.sco_header( - context, page_title="Saisie des absences", REQUEST=REQUEST - ) + html_sco_header.sco_header(page_title="Saisie des absences") + "

Aucun étudiant !

" + html_sco_header.sco_footer() ) @@ -586,12 +582,10 @@ def SignaleAbsenceGrSemestre( H = [ html_sco_header.sco_header( - context, page_title="Saisie des absences", init_qtip=True, javascripts=["js/etud_info.js", "js/abs_ajax.js"], no_side_bar=1, - REQUEST=REQUEST, ), """

Saisie des absences %s %s, @@ -1000,11 +994,7 @@ def EtatAbsencesDate( groups_infos = sco_groups_view.DisplayedGroupsInfos( context, group_ids, REQUEST=REQUEST ) - H = [ - html_sco_header.sco_header( - context, page_title="Etat des absences", REQUEST=REQUEST - ) - ] + H = [html_sco_header.sco_header(page_title="Etat des absences")] if date: dateiso = ndb.DateDMYtoISO(date) nbetud = 0 diff --git a/app/views/notes.py b/app/views/notes.py index 4d952f80e..751baa8dd 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -462,9 +462,7 @@ def formation_import_xml(context, file, REQUEST): def formation_import_xml_form(context, REQUEST): "form import d'une formation en XML" H = [ - html_sco_header.sco_header( - context, page_title="Import d'une formation", REQUEST=REQUEST - ), + html_sco_header.sco_header(page_title="Import d'une formation"), """

Import d'une formation

Création d'une formation (avec UE, matières, modules) à partir un fichier XML (réservé aux utilisateurs avertis)

@@ -2370,7 +2368,7 @@ def check_sem_integrity(context, formsemestre_id, REQUEST, fix=False): modimpl["mod"] = mod H = [ - html_sco_header.sco_header(context, REQUEST=REQUEST), + html_sco_header.sco_header(), "

formation_id=%s" % sem["formation_id"], ] if bad_ue: @@ -2447,11 +2445,7 @@ def check_form_integrity(context, formation_id, fix=False, REQUEST=None): else: txth = "OK" log("ok") - return ( - html_sco_header.sco_header(context, REQUEST=REQUEST) - + txth - + html_sco_header.sco_footer() - ) + return html_sco_header.sco_header() + txth + html_sco_header.sco_footer() @bp.route("/check_formsemestre_integrity") @@ -2500,9 +2494,7 @@ def check_formsemestre_integrity(context, formsemestre_id, REQUEST=None): diag = ["OK"] log("ok") return ( - html_sco_header.sco_header(context, REQUEST=REQUEST) - + "
".join(diag) - + html_sco_header.sco_footer() + html_sco_header.sco_header() + "
".join(diag) + html_sco_header.sco_footer() ) @@ -2520,7 +2512,7 @@ def check_integrity_all(context, REQUEST=None): for sem in sco_formsemestre.do_formsemestre_list(context): check_formsemestre_integrity(context, sem["formsemestre_id"], REQUEST=REQUEST) return ( - html_sco_header.sco_header(context, REQUEST=REQUEST) + html_sco_header.sco_header() + "

empty page: see logs and mails

" + html_sco_header.sco_footer() )