From 090391300af49ed13a36b11e8e1abc87a9221610 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 10 Nov 2021 12:03:49 +0100 Subject: [PATCH 1/2] add dependence on cracklib-runtime --- tools/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/debian/control b/tools/debian/control index 1c6a493cb..fe734c063 100644 --- a/tools/debian/control +++ b/tools/debian/control @@ -4,4 +4,4 @@ Architecture: amd64 Maintainer: Emmanuel Viennet Description: ScoDoc 9 Un logiciel pour le suivi de la scolarité universitaire. -Depends: adduser, curl, gcc, graphviz, libpq-dev, postfix|exim4, libcrack2-dev, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, redis, ufw +Depends: adduser, curl, gcc, graphviz, libpq-dev, postfix|exim4, cracklib-runtime, libcrack2-dev, python3-dev, python3-venv, python3-pip, python3-wheel, nginx, postgresql, redis, ufw From c23a5abb6c151524ac96cedf19913349cdc3fc8c Mon Sep 17 00:00:00 2001 From: Place Jean-Marie Date: Fri, 12 Nov 2021 09:25:47 +0100 Subject: [PATCH 2/2] fix_groups_missing_from_prepajury.xlsx --- app/scodoc/sco_groups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py index 14410977a..136529865 100644 --- a/app/scodoc/sco_groups.py +++ b/app/scodoc/sco_groups.py @@ -377,7 +377,7 @@ def formsemestre_get_etud_groupnames(formsemestre_id, attr="group_name"): { etudid : { partition_id : group_name }} (attr=group_name or group_id) """ infos = ndb.SimpleDictFetch( - """SELECT i.id AS etudid, p.id AS partition_id, + """SELECT i.etudid AS etudid, p.id AS partition_id, gd.group_name, gd.id AS group_id FROM notes_formsemestre_inscription i, partition p, group_descr gd, group_membership gm