diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index 3a3ddd152..79313e6b0 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -64,7 +64,9 @@ from app.scodoc import sco_xml import sco_version # le répertoire static, lié à chaque release pour éviter les problèmes de caches -STATIC_DIR = "/ScoDoc/static/links/" + sco_version.SCOVERSION +STATIC_DIR = ( + os.environ.get("SCRIPT_NAME", "") + "/ScoDoc/static/links/" + sco_version.SCOVERSION +) # ----- CALCUL ET PRESENTATION DES NOTES NOTES_PRECISION = 1e-4 # evite eventuelles erreurs d'arrondis diff --git a/app/templates/base.j2 b/app/templates/base.j2 index 27618bba6..19388ebc3 100644 --- a/app/templates/base.j2 +++ b/app/templates/base.j2 @@ -3,8 +3,8 @@ {% block styles %} {{super()}} - - + + {% endblock %} {% block title %} diff --git a/scodoc.py b/scodoc.py index 1640f9071..2fd0f9a2e 100755 --- a/scodoc.py +++ b/scodoc.py @@ -46,6 +46,7 @@ from app.scodoc import sco_dump_db from app.scodoc.sco_logos import make_logo_local from app.scodoc.sco_permissions import Permission from app.views import notes, scolar +import app.scodoc.sco_utils as scu import tools from tools.fakedatabase import create_test_api_database @@ -55,6 +56,12 @@ app = create_app(RunningConfig) cli.register(app) +@app.context_processor +def inject_sco_utils(): + "Make scu available in all Jinja templates" + return dict(scu=scu) + + @app.shell_context_processor def make_shell_context(): import numpy as np diff --git a/tools/restore_scodoc9_data.sh b/tools/restore_scodoc9_data.sh index 87f95a796..04f68183d 100755 --- a/tools/restore_scodoc9_data.sh +++ b/tools/restore_scodoc9_data.sh @@ -42,7 +42,7 @@ then DB_DEST="SCODOC" else echo "restauration des données dans la configuration actuelle" - DB_CURRENT=$(su -c "(cd $SCODOC_DIR && source venv/bin/activate && flask scodoc-database -n)") + DB_CURRENT=$(su -c "(cd $SCODOC_DIR && source venv/bin/activate && flask scodoc-database -n)" "$SCODOC_USER") DB_DEST="$DB_CURRENT" KEEP_ENV="Y" if [ "$1" = "--keep-env" ]