This commit is contained in:
Jean-Marie Place 2021-12-07 16:43:44 +01:00
parent 74f68ee353
commit 828cd35f29
4 changed files with 13 additions and 6 deletions

View File

@ -33,6 +33,7 @@ Emmanuel Viennet, 2021
from app.models import ScoDocSiteConfig
from app.scodoc.sco_logos import write_logo, find_logo, delete_logo
import app
from flask import current_app
class Action:
@ -84,6 +85,7 @@ class LogoUpdate(Action):
return None
def execute(self):
current_app.logger.info(self.message)
write_logo(
stream=self.parameters["upload"],
dept_id=self.parameters["dept_id"],
@ -113,6 +115,7 @@ class LogoDelete(Action):
return None
def execute(self):
current_app.logger.info(self.message)
delete_logo(name=self.parameters["logo_id"], dept_id=self.parameters["dept_id"])
@ -145,6 +148,7 @@ class LogoInsert(Action):
dept_id = self.parameters["dept_key"]
if dept_id == GLOBAL:
dept_id = None
current_app.logger.info(self.message)
write_logo(
stream=self.parameters["upload"],
name=self.parameters["name"],
@ -172,5 +176,6 @@ class BonusSportUpdate(Action):
return []
def execute(self):
current_app.logger.info(self.message)
ScoDocSiteConfig.set_bonus_sport_func(self.parameters["bonus_sport_func_name"])
app.clear_scodoc_cache()

View File

@ -154,7 +154,6 @@ class AddLogoForm(FlaskForm):
def select_action(self):
if self.data["do_insert"]:
breakpoint()
if self.validate():
return LogoInsert.build_action(self.data)
return None
@ -386,7 +385,6 @@ def configuration():
)
)
if form.is_submitted():
breakpoint()
action = form.select_action()
if action:
action.execute()

View File

@ -2016,14 +2016,14 @@ class BasePreferences(object):
self.load()
H = [
html_sco_header.sco_header(page_title="Préférences"),
# "<h2>Préférences globales pour %s</h2>" % scu.ScoURL(),
"<h2>Préférences globales pour %s</h2>" % scu.ScoURL(),
# f"""<p><a href="{url_for("scolar.config_logos", scodoc_dept=g.scodoc_dept)
# }">modification des logos du département (pour documents pdf)</a></p>"""
# if current_user.is_administrator()
# else "",
# """<p class="help">Ces paramètres s'appliquent par défaut à tous les semestres, sauf si ceux-ci définissent des valeurs spécifiques.</p>
# <p class="msg">Attention: cliquez sur "Enregistrer les modifications" en bas de page pour appliquer vos changements !</p>
# """,
"""<p class="help">Ces paramètres s'appliquent par défaut à tous les semestres, sauf si ceux-ci définissent des valeurs spécifiques.</p>
<p class="msg">Attention: cliquez sur "Enregistrer les modifications" en bas de page pour appliquer vos changements !</p>
""",
]
form = self.build_tf_form()
tf = TrivialFormulator(

View File

@ -64,6 +64,7 @@ from app.decorators import (
scodoc7func,
scodoc,
permission_required_compat_scodoc7,
permission_required,
)
from app.scodoc.sco_config_form import configuration
from app.scodoc.sco_exceptions import AccessDenied
@ -204,6 +205,9 @@ def about(scodoc_dept=None):
@bp.route("/ScoDoc/configuration", methods=["GET", "POST"])
@admin_required
def configuration():
auth_name = str(current_user)
if not current_user.is_administrator():
raise AccessDenied("invalid user (%s) must be SuperAdmin" % auth_name)
return sco_config_form.configuration()