jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

placement_group_size_control #2

Closed
jmplace wants to merge 150 commits from placement_group_size_control into master
pull from: placement_group_size_control
merge into: jmplace:master
Conversation 0 Commits 150 Files Changed 131 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b56f205e89 - Show all commits

5
app/scodoc/sco_groups_view.py
View File

@ -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 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) default_group_id = sco_groups.get_default_group(groups_infos.formsemestre_id)
H = [ H = [
"""<form id="group_selector" method="get"> """<form id="group_selector" method="get">
<input type="hidden" name="formsemestre_id" id="formsemestre_id" value="%s"/> <input type="hidden" name="formsemestre_id" id="formsemestre_id" value="%s"/>
@ -305,8 +304,8 @@ class DisplayedGroupsInfos(object):
if isinstance(group_ids, int): if isinstance(group_ids, int):
if group_ids: if group_ids:
group_ids = [group_ids] # cas ou un seul parametre, pas de liste group_ids = [group_ids] # cas ou un seul parametre, pas de liste
else: else:
group_ids = [] group_ids = [int(g) for g in group_ids]
if not formsemestre_id and moduleimpl_id: if not formsemestre_id and moduleimpl_id:
mods = sco_moduleimpl.do_moduleimpl_list(moduleimpl_id=moduleimpl_id) mods = sco_moduleimpl.do_moduleimpl_list(moduleimpl_id=moduleimpl_id)
if len(mods) != 1: if len(mods) != 1:

2
app/scodoc/sco_page_etud.py
View File

@ -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. """An HTML div with basic information and links about this etud.
Used for popups information windows. 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) with_photo = int(with_photo)
etud = sco_etud.get_etud_info(filled=True)[0] etud = sco_etud.get_etud_info(filled=True)[0]
photo_html = sco_photos.etud_photo_html( photo_html = sco_photos.etud_photo_html(