From 289cc39a6c05f6146354774e6b83101067fb67fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 26 May 2017 18:10:51 +0200 Subject: [PATCH] Version 16.225.5 --- swad_changelog.h | 3 ++- swad_user.c | 46 ++++++++++++---------------------------------- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index a0c1a95df..a051a9906 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -238,13 +238,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.225.4 (2017-05-26)" +#define Log_PLATFORM_VERSION "SWAD 16.225.5 (2017-05-26)" #define CSS_FILE "swad16.222.css" #define JS_FILE "swad16.206.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 16.225.5: May 26, 2017 Removed link to show all data of students. (220543 lines) Version 16.225.4: May 26, 2017 Removed link to show all data of teachers. (220562 lines) Version 16.225.3: May 26, 2017 Removed link to show all data of guests. (220582 lines) Version 16.225.2: May 26, 2017 Fixed bug in lists of teachers. (220601 lines) diff --git a/swad_user.c b/swad_user.c index 6fcbafed1..b1f06f9a7 100644 --- a/swad_user.c +++ b/swad_user.c @@ -200,7 +200,6 @@ static void Usr_PutIconToPrintStds (void); static void Usr_PutIconToPrintTchs (void); static void Usr_PutIconToShowGstsAllData (void); static void Usr_PutIconToShowStdsAllData (void); -static void Usr_PutLinkToShowStdsAllData (void); static void Usr_PutIconToShowTchsAllData (void); static void Usr_ShowGstsAllDataParams (void); static void Usr_ShowStdsAllDataParams (void); @@ -7466,27 +7465,18 @@ void Usr_SeeStudents (void) Usr_ShowFormsToSelectUsrListType (ActLstStd); /***** Draw a class photo with students of the course *****/ - switch (Gbl.Usrs.Me.ListType) - { - case Usr_LIST_AS_CLASS_PHOTO: - Lay_WriteHeaderClassPhoto (false,true, - (Gbl.Scope.Current == Sco_SCOPE_CRS || - Gbl.Scope.Current == Sco_SCOPE_DEG || - Gbl.Scope.Current == Sco_SCOPE_CTR || - Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : - -1L, - (Gbl.Scope.Current == Sco_SCOPE_CRS || - Gbl.Scope.Current == Sco_SCOPE_DEG) ? Gbl.CurrentDeg.Deg.DegCod : - -1L, - Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : - -1L); - break; - case Usr_LIST_AS_LISTING: - Usr_PutLinkToShowStdsAllData (); - break; - default: - break; - } + if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) + Lay_WriteHeaderClassPhoto (false,true, + (Gbl.Scope.Current == Sco_SCOPE_CRS || + Gbl.Scope.Current == Sco_SCOPE_DEG || + Gbl.Scope.Current == Sco_SCOPE_CTR || + Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : + -1L, + (Gbl.Scope.Current == Sco_SCOPE_CRS || + Gbl.Scope.Current == Sco_SCOPE_DEG) ? Gbl.CurrentDeg.Deg.DegCod : + -1L, + Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : + -1L); /* Start form */ if (ICanViewRecords) @@ -7825,18 +7815,6 @@ static void Usr_PutIconToShowStdsAllData (void) NULL); } -static void Usr_PutLinkToShowStdsAllData (void) - { - extern const char *Txt_Show_all_data; - - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActLstStdAll,NULL,Usr_ShowStdsAllDataParams, - "table64x64.gif", - Txt_Show_all_data,Txt_Show_all_data, - NULL); - fprintf (Gbl.F.Out,"
"); - } - static void Usr_PutIconToShowTchsAllData (void) { extern const char *Txt_Show_all_data;