From 987800c30e0599b77159ddc2b6191b5a1433de8b Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet
Date: Sat, 18 Sep 2021 10:10:02 +0200
Subject: [PATCH] =?UTF-8?q?Remplace=20REQUEST.URL=20par=20acc=C3=A8s=20?=
=?UTF-8?q?=C3=A0=20Flask=20request=20global=20object?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/decorators.py | 16 +++++------
app/scodoc/sco_abs_views.py | 6 ++---
app/scodoc/sco_archives.py | 4 +--
app/scodoc/sco_archives_etud.py | 6 ++---
app/scodoc/sco_bulletins.py | 30 ++++++++++++++-------
app/scodoc/sco_bulletins_generator.py | 6 +++--
app/scodoc/sco_bulletins_pdf.py | 6 ++---
app/scodoc/sco_cost_formation.py | 6 +++--
app/scodoc/sco_debouche.py | 4 +--
app/scodoc/sco_dept.py | 6 ++---
app/scodoc/sco_edit_formation.py | 4 +--
app/scodoc/sco_edit_matiere.py | 10 +++----
app/scodoc/sco_edit_module.py | 8 +++---
app/scodoc/sco_edit_ue.py | 10 ++++---
app/scodoc/sco_etape_apogee_view.py | 9 ++++---
app/scodoc/sco_evaluations.py | 4 +--
app/scodoc/sco_export_results.py | 4 +--
app/scodoc/sco_formations.py | 4 +--
app/scodoc/sco_formsemestre.py | 4 +--
app/scodoc/sco_formsemestre_custommenu.py | 4 +--
app/scodoc/sco_formsemestre_edit.py | 12 ++++-----
app/scodoc/sco_formsemestre_exterieurs.py | 6 ++---
app/scodoc/sco_formsemestre_inscriptions.py | 6 ++---
app/scodoc/sco_formsemestre_status.py | 4 +--
app/scodoc/sco_formsemestre_validation.py | 4 +--
app/scodoc/sco_groups.py | 8 +++---
app/scodoc/sco_groups_view.py | 6 ++---
app/scodoc/sco_inscr_passage.py | 4 +--
app/scodoc/sco_liste_notes.py | 4 +--
app/scodoc/sco_lycee.py | 6 ++---
app/scodoc/sco_moduleimpl_inscriptions.py | 4 +--
app/scodoc/sco_photos.py | 2 +-
app/scodoc/sco_placement.py | 3 ++-
app/scodoc/sco_poursuite_dut.py | 4 +--
app/scodoc/sco_preferences.py | 8 +++---
app/scodoc/sco_prepajury.py | 4 ++-
app/scodoc/sco_pvjury.py | 10 +++----
app/scodoc/sco_recapcomplet.py | 4 ++-
app/scodoc/sco_report.py | 16 +++++------
app/scodoc/sco_saisie_notes.py | 4 +--
app/scodoc/sco_trombino.py | 4 +--
app/scodoc/sco_ue_external.py | 3 ++-
app/scodoc/sco_undo_notes.py | 4 ++-
app/scodoc/sco_users.py | 6 ++---
app/views/absences.py | 12 ++++-----
app/views/entreprises.py | 30 +++++++++++----------
app/views/notes.py | 22 +++++++--------
app/views/scolar.py | 16 +++++------
app/views/users.py | 4 +--
49 files changed, 199 insertions(+), 172 deletions(-)
diff --git a/app/decorators.py b/app/decorators.py
index 4987f0d8..a72d8253 100644
--- a/app/decorators.py
+++ b/app/decorators.py
@@ -46,15 +46,15 @@ class ZRequest(object):
# if current_app.config["DEBUG"]:
# le ReverseProxied se charge maintenant de mettre le bon protocole http ou https
- self.URL = request.base_url
- self.BASE0 = request.url_root
+ # self.URL = request.base_url
+ # self.BASE0 = request.url_root
# else:
# self.URL = request.base_url.replace("http://", "https://")
# self.BASE0 = request.url_root.replace("http://", "https://")
- self.URL0 = self.URL
+ # self.URL0 = self.URL
# query_string is bytes:
- self.QUERY_STRING = request.query_string.decode("utf-8")
- self.REQUEST_METHOD = request.method
+ # self.QUERY_STRING = request.query_string.decode("utf-8")
+ # self.REQUEST_METHOD = request.method
self.AUTHENTICATED_USER = current_user
self.REMOTE_ADDR = request.remote_addr
if request.method == "POST":
@@ -79,11 +79,7 @@ class ZRequest(object):
self.RESPONSE = ZResponse()
def __str__(self):
- return """REQUEST
- URL={r.URL}
- QUERY_STRING={r.QUERY_STRING}
- REQUEST_METHOD={r.REQUEST_METHOD}
- AUTHENTICATED_USER={r.AUTHENTICATED_USER}
+ return """ZREQUEST
form={r.form}
""".format(
r=self
diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py
index a05d42c5..f75e0b6b 100644
--- a/app/scodoc/sco_abs_views.py
+++ b/app/scodoc/sco_abs_views.py
@@ -30,7 +30,7 @@
"""
import datetime
-from flask import url_for, g
+from flask import url_for, g, request
import app.scodoc.sco_utils as scu
from app.scodoc import notesdb as ndb
@@ -814,8 +814,8 @@ def ListeAbsEtud(
etudid, datedebut, with_evals=with_evals, format=format
)
if REQUEST:
- base_url_nj = "%s?etudid=%s&absjust_only=0" % (REQUEST.URL0, etudid)
- base_url_j = "%s?etudid=%s&absjust_only=1" % (REQUEST.URL0, etudid)
+ base_url_nj = "%s?etudid=%s&absjust_only=0" % (request.base_url, etudid)
+ base_url_j = "%s?etudid=%s&absjust_only=1" % (request.base_url, etudid)
else:
base_url_nj = base_url_j = ""
tab_absnonjust = GenTable(
diff --git a/app/scodoc/sco_archives.py b/app/scodoc/sco_archives.py
index ca73ac6c..e17cea63 100644
--- a/app/scodoc/sco_archives.py
+++ b/app/scodoc/sco_archives.py
@@ -56,7 +56,7 @@ import shutil
import time
import flask
-from flask import g
+from flask import g, request
import app.scodoc.sco_utils as scu
from config import Config
@@ -457,7 +457,7 @@ enregistrés et non modifiables, on peut les retrouver ultérieurement.
)
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
descr,
cancelbutton="Annuler",
diff --git a/app/scodoc/sco_archives_etud.py b/app/scodoc/sco_archives_etud.py
index 157d5217..fa41bb65 100644
--- a/app/scodoc/sco_archives_etud.py
+++ b/app/scodoc/sco_archives_etud.py
@@ -30,7 +30,7 @@
les dossiers d'admission et autres pièces utiles.
"""
import flask
-from flask import url_for, g
+from flask import url_for, g, request
import app.scodoc.sco_utils as scu
from app.scodoc import sco_import_etuds
@@ -153,7 +153,7 @@ def etud_upload_file_form(REQUEST, etudid):
% (scu.CONFIG.ETUD_MAX_FILE_SIZE // (1024 * 1024)),
]
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
("etudid", {"default": etudid, "input_type": "hidden"}),
@@ -308,7 +308,7 @@ def etudarchive_import_files_form(group_id, REQUEST=None):
]
F = html_sco_header.sco_footer()
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
("xlsfile", {"title": "Fichier Excel:", "input_type": "file", "size": 40}),
diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py
index 215985b9..6a5bbb96 100644
--- a/app/scodoc/sco_bulletins.py
+++ b/app/scodoc/sco_bulletins.py
@@ -28,6 +28,7 @@
"""Génération des bulletins de notes
"""
+from app.models import formsemestre
import time
import pprint
import email
@@ -38,7 +39,7 @@ from email.header import Header
from reportlab.lib.colors import Color
import urllib
-from flask import g
+from flask import g, request
from flask import url_for
from flask_login import current_user
from flask_mail import Message
@@ -143,7 +144,7 @@ def formsemestre_bulletinetud_dict(
I["formsemestre_id"] = formsemestre_id
I["sem"] = nt.sem
if REQUEST:
- I["server_name"] = REQUEST.BASE0
+ I["server_name"] = request.url_root
else:
I["server_name"] = ""
@@ -1032,7 +1033,7 @@ def _formsemestre_bulletinetud_header_html(
),
"""
""" % (
- REQUEST.URL0,
+ request.base_url,
formsemestre_id,
n_group_td,
n_group_tp,
@@ -190,7 +192,7 @@ def formsemestre_estim_cost(
)
tab.html_before_table = h
tab.base_url = "%s?formsemestre_id=%s&n_group_td=%s&n_group_tp=%s&coef_tp=%s" % (
- REQUEST.URL0,
+ request.base_url,
formsemestre_id,
n_group_td,
n_group_tp,
diff --git a/app/scodoc/sco_debouche.py b/app/scodoc/sco_debouche.py
index df93897c..2dc2f10a 100644
--- a/app/scodoc/sco_debouche.py
+++ b/app/scodoc/sco_debouche.py
@@ -29,7 +29,7 @@
Rapport (table) avec dernier semestre fréquenté et débouché de chaque étudiant
"""
import http
-from flask import url_for, g
+from flask import url_for, g, request
import app.scodoc.sco_utils as scu
import app.scodoc.notesdb as ndb
@@ -64,7 +64,7 @@ def report_debouche_date(start_year=None, format="html", REQUEST=None):
"Généré par %s le " % sco_version.SCONAME + scu.timedate_human_repr() + ""
)
tab.caption = "Récapitulatif débouchés à partir du 1/1/%s." % start_year
- tab.base_url = "%s?start_year=%s" % (REQUEST.URL0, start_year)
+ tab.base_url = "%s?start_year=%s" % (request.base_url, start_year)
return tab.make_page(
title="""""",
init_qtip=True,
diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py
index 349ad009..3d342dcc 100644
--- a/app/scodoc/sco_dept.py
+++ b/app/scodoc/sco_dept.py
@@ -28,7 +28,7 @@
"""Page accueil département (liste des semestres, etc)
"""
-from flask import g
+from flask import g, request
from flask_login import current_user
import app
@@ -131,7 +131,7 @@ def index_html(REQUEST=None, showcodes=0, showsemtable=0):
if not showsemtable:
H.append(
'
Voir tous les semestres
'
- % REQUEST.URL0
+ % request.base_url
)
H.append(
@@ -242,7 +242,7 @@ def _sem_table_gt(sems, showcodes=False):
rows=sems,
html_class="table_leftalign semlist",
html_sortable=True,
- # base_url = '%s?formsemestre_id=%s' % (REQUEST.URL0, formsemestre_id),
+ # base_url = '%s?formsemestre_id=%s' % (request.base_url, formsemestre_id),
# caption='Maquettes enregistrées',
preferences=sco_preferences.SemPreferences(),
)
diff --git a/app/scodoc/sco_edit_formation.py b/app/scodoc/sco_edit_formation.py
index b52c3a53..3ee23575 100644
--- a/app/scodoc/sco_edit_formation.py
+++ b/app/scodoc/sco_edit_formation.py
@@ -29,7 +29,7 @@
(portage from DTML)
"""
import flask
-from flask import g, url_for
+from flask import g, url_for, request
import app.scodoc.notesdb as ndb
import app.scodoc.sco_utils as scu
@@ -159,7 +159,7 @@ def formation_edit(formation_id=None, create=False, REQUEST=None):
)
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
("formation_id", {"default": formation_id, "input_type": "hidden"}),
diff --git a/app/scodoc/sco_edit_matiere.py b/app/scodoc/sco_edit_matiere.py
index 6b9e7d43..f3fbabe0 100644
--- a/app/scodoc/sco_edit_matiere.py
+++ b/app/scodoc/sco_edit_matiere.py
@@ -29,7 +29,7 @@
(portage from DTML)
"""
import flask
-from flask import g, url_for
+from flask import g, url_for, request
import app.scodoc.notesdb as ndb
import app.scodoc.sco_utils as scu
@@ -116,7 +116,7 @@ associé.
""",
]
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
("ue_id", {"input_type": "hidden", "default": ue_id}),
@@ -202,7 +202,7 @@ def matiere_delete(matiere_id=None, REQUEST=None):
]
dest_url = scu.NotesURL() + "/ue_list?formation_id=" + str(UE["formation_id"])
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(("matiere_id", {"input_type": "hidden"}),),
initvalues=M,
@@ -256,7 +256,7 @@ des notes.
associé.
"""
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
("matiere_id", {"input_type": "hidden"}),
@@ -323,4 +323,4 @@ def matiere_is_locked(matiere_id):
""",
{"matiere_id": matiere_id},
)
- return len(r) > 0
\ No newline at end of file
+ return len(r) > 0
diff --git a/app/scodoc/sco_edit_module.py b/app/scodoc/sco_edit_module.py
index 3b4ce254..b0b6ca76 100644
--- a/app/scodoc/sco_edit_module.py
+++ b/app/scodoc/sco_edit_module.py
@@ -29,7 +29,7 @@
(portage from DTML)
"""
import flask
-from flask import url_for, g
+from flask import url_for, g, request
import app.scodoc.notesdb as ndb
import app.scodoc.sco_utils as scu
@@ -143,7 +143,7 @@ def module_create(matiere_id=None, REQUEST=None):
else:
default_num = 10
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
(
@@ -294,7 +294,7 @@ def module_delete(module_id=None, REQUEST=None):
dest_url = scu.NotesURL() + "/ue_list?formation_id=" + str(Mod["formation_id"])
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(("module_id", {"input_type": "hidden"}),),
initvalues=Mod,
@@ -388,7 +388,7 @@ def module_edit(module_id=None, REQUEST=None):
)
tf = TrivialFormulator(
- REQUEST.URL0,
+ request.base_url,
REQUEST.form,
(
(
diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py
index db19d56b..6f51ee4d 100644
--- a/app/scodoc/sco_edit_ue.py
+++ b/app/scodoc/sco_edit_ue.py
@@ -29,7 +29,7 @@
"""
import flask
-from flask import g, url_for
+from flask import g, url_for, request
from flask_login import current_user
import app.scodoc.notesdb as ndb
@@ -326,7 +326,11 @@ def ue_edit(ue_id=None, create=False, formation_id=None, REQUEST=None):
)
)
tf = TrivialFormulator(
- REQUEST.URL0, REQUEST.form, fw, initvalues=initvalues, submitlabel=submitlabel
+ request.base_url,
+ REQUEST.form,
+ fw,
+ initvalues=initvalues,
+ submitlabel=submitlabel,
)
if tf[0] == 0:
X = """
@@ -1033,7 +1037,7 @@ def formation_table_recap(formation_id, format="html", REQUEST=None):
caption=title,
html_caption=title,
html_class="table_leftalign",
- base_url="%s?formation_id=%s" % (REQUEST.URL0, formation_id),
+ base_url="%s?formation_id=%s" % (request.base_url, formation_id),
page_title=title,
html_title="" + title + "
",
pdf_title=title,
diff --git a/app/scodoc/sco_etape_apogee_view.py b/app/scodoc/sco_etape_apogee_view.py
index 1b625bcd..a4440bf7 100644
--- a/app/scodoc/sco_etape_apogee_view.py
+++ b/app/scodoc/sco_etape_apogee_view.py
@@ -32,7 +32,7 @@ import io
from zipfile import ZipFile
import flask
-from flask import url_for, g, send_file
+from flask import url_for, g, send_file, request
# from werkzeug.utils import send_file
@@ -250,7 +250,7 @@ def apo_semset_maq_status(
"""