From 30296f008e394ecdad31e054507b87c05258511b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 19 Mar 2016 00:19:18 +0100 Subject: [PATCH] Version 15.151.2 --- swad_changelog.h | 3 ++- swad_group.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 0daef15ae..6b3ccb1b7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.151.1 (2016-03-18)" +#define Log_PLATFORM_VERSION "SWAD 15.151.2 (2016-03-19)" #define CSS_FILE "swad15.150.2.css" #define JS_FILE "swad15.131.3.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 15.151.2: Mar 19, 2016 Changes in layout of groups. (195935 lines) Version 15.151.1: Mar 18, 2016 Changes in layout of groups. (195929 lines) Version 15.151: Mar 18, 2016 Changes in layout of header class photo. (195930 lines) Version 15.150.10:Mar 18, 2016 Icon to print calendar integrated in frame. (195961 lines) diff --git a/swad_group.c b/swad_group.c index 7c899658f..b0b594db1 100644 --- a/swad_group.c +++ b/swad_group.c @@ -234,9 +234,17 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) extern const char *Txt_Update_students; extern const char *Txt_Update_students_according_to_selected_groups; unsigned NumGrpTyp; + bool ICanEdit = !Gbl.Form.Inside && + (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); fprintf (Gbl.F.Out,"
"); + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Groups, + ICanEdit ? Grp_PutIconToEditGroups : + NULL); + /***** Start form to update the students listed depending on the groups selected *****/ Act_FormStart (NextAction); @@ -247,9 +255,6 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) /***** Put parameters needed depending on the action *****/ Usr_PutExtraParamsUsrList (NextAction); - /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Groups,NULL); - /***** Select all groups *****/ fprintf (Gbl.F.Out,"
" ""); - /***** End frame *****/ - Lay_EndRoundFrame (); - /***** End form *****/ Act_FormEnd (); + + /***** End frame *****/ + Lay_EndRoundFrame (); fprintf (Gbl.F.Out,"
"); }