From b56f205e8931650160fa445418b7bf9c2923204e Mon Sep 17 00:00:00 2001 From: Place Jean-Marie Date: Thu, 23 Sep 2021 07:33:28 +0200 Subject: [PATCH 1/3] fix group_selector / info_etu popup --- app/scodoc/sco_groups_view.py | 5 ++--- app/scodoc/sco_page_etud.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index f14bc5586..3d6c494fb 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -165,7 +165,6 @@ def form_groups_choice(groups_infos, with_selectall_butt=False, submit_on_change Si submit_on_change, ajoute une classe "submit_on_change" qui est utilisee en JS """ default_group_id = sco_groups.get_default_group(groups_infos.formsemestre_id) - H = [ """
@@ -305,8 +304,8 @@ class DisplayedGroupsInfos(object): if isinstance(group_ids, int): if group_ids: group_ids = [group_ids] # cas ou un seul parametre, pas de liste - else: - group_ids = [] + else: + group_ids = [int(g) for g in group_ids] if not formsemestre_id and moduleimpl_id: mods = sco_moduleimpl.do_moduleimpl_list(moduleimpl_id=moduleimpl_id) if len(mods) != 1: diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index bf9481234..6a59538cc 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -537,7 +537,7 @@ def etud_info_html(etudid, with_photo="1", REQUEST=None, debug=False): """An HTML div with basic information and links about this etud. Used for popups information windows. """ - formsemestre_id = sco_formsemestre_status.retreive_formsemestre_from_request() + formsemestre_id = int(sco_formsemestre_status.retreive_formsemestre_from_request()) with_photo = int(with_photo) etud = sco_etud.get_etud_info(filled=True)[0] photo_html = sco_photos.etud_photo_html( From a4d091fa2db83bdb5197512879a39f32e7e060c3 Mon Sep 17 00:00:00 2001 From: Jean-Marie Place Date: Thu, 23 Sep 2021 14:36:47 +0200 Subject: [PATCH 2/3] =?UTF-8?q?retrait=20du=20cast=20int(retreive=5Fformse?= =?UTF-8?q?mestre=5Ffrom=5Frequest(...))=20r=C3=A9alis=C3=A9e=20par=20la?= =?UTF-8?q?=20fonction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_page_etud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py index 6a59538cc..bf9481234 100644 --- a/app/scodoc/sco_page_etud.py +++ b/app/scodoc/sco_page_etud.py @@ -537,7 +537,7 @@ def etud_info_html(etudid, with_photo="1", REQUEST=None, debug=False): """An HTML div with basic information and links about this etud. Used for popups information windows. """ - formsemestre_id = int(sco_formsemestre_status.retreive_formsemestre_from_request()) + formsemestre_id = sco_formsemestre_status.retreive_formsemestre_from_request() with_photo = int(with_photo) etud = sco_etud.get_etud_info(filled=True)[0] photo_html = sco_photos.etud_photo_html( From 845152afdd8e36b4b3fbc09339516c9fe8123457 Mon Sep 17 00:00:00 2001 From: Jean-Marie Place Date: Thu, 23 Sep 2021 14:44:28 +0200 Subject: [PATCH 3/3] put back one empty line --- app/scodoc/sco_groups_view.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index 3d6c494fb..2477bb5d0 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -165,6 +165,7 @@ def form_groups_choice(groups_infos, with_selectall_butt=False, submit_on_change Si submit_on_change, ajoute une classe "submit_on_change" qui est utilisee en JS """ default_group_id = sco_groups.get_default_group(groups_infos.formsemestre_id) + H = [ """