Version 16.231.2

This commit is contained in:
Antonio Cañas Vargas 2017-05-31 10:51:29 +02:00
parent 827b4fd49f
commit 4f0ccdc1c4
2 changed files with 12 additions and 7 deletions

View File

@ -231,13 +231,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.231.1 (2017-05-31)"
#define Log_PLATFORM_VERSION "SWAD 16.231.2 (2017-05-31)"
#define CSS_FILE "swad16.226.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.231.2: May 31, 2017 Fixed bug in connected users. (221036 lines)
Version 16.231.1: May 31, 2017 Fixed bugs in enrolment and groups. (221031 lines)
Version 16.231: May 31, 2017 Non-editing teachers can edit (with restrictions) in private zones. (221031 lines)
Version 16.230: May 30, 2017 Number of teachers and non-editing teachers in list of groups. (220953 lines)

View File

@ -1010,14 +1010,15 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
Act_FormStartUnique (ActSeeRecOneTch);
break;
default:
Lay_ShowErrorAndExit ("Wrong role");
Lay_ShowErrorAndExit ("Wrong role.");
break;
}
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"<div class=\"CON_NAME_NARROW\">"); // Limited width
fprintf (Gbl.F.Out,"<div class=\"CON_NAME_NARROW %s\">",Font); // Limited width
Act_LinkFormSubmitUnique (Txt_View_record_for_this_course,Font);
Usr_WriteFirstNameBRSurnames (UsrDat);
fprintf (Gbl.F.Out,"</a>"
"</div>");
"</div>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
@ -1058,8 +1059,11 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
char PhotoURL[PATH_MAX + 1];
const char *Font;
struct UsrData UsrDat;
bool PutLinkToRecord = (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
Gbl.Scope.Current == Sco_SCOPE_CRS);
bool PutLinkToRecord = (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected
Gbl.Scope.Current == Sco_SCOPE_CRS && // Scope is current course
(Role == Rol_STD || // Role is student,...
Role == Rol_NET || // ...non-editing teacher...
Role == Rol_TCH)); // ...or teacher
/***** Get connected users who belong to current location from database *****/
switch (Role)
@ -1213,7 +1217,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
Act_FormStart (ActSeeRecOneTch);
break;
default:
Lay_ShowErrorAndExit ("Wrong role");
Lay_ShowErrorAndExit ("Wrong role.");
}
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
}