From ba9f87cd110f436f2def4d4f0e72653dad39dd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 26 Jan 2017 11:08:19 +0100 Subject: [PATCH] Version 16.123.4 --- swad_changelog.h | 6 ++++-- swad_record.c | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 578675109..1e6fe492e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -187,18 +187,20 @@ // TODO: Fix bug when creating a new attendance event: if title is repeated, form is cleared // TODO: Fix bug: When registering an administrator, the user's name changes are ignored +// TODO: Teachers sbould view ID of students/teachers with no name/email + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.123.3 (2017-01-25)" +#define Log_PLATFORM_VERSION "SWAD 16.123.4 (2017-01-25)" #define CSS_FILE "swad16.123.css" #define JS_FILE "swad16.123.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.123.4: Jan 25, 2017 Teachers can view ID of students/teachers with no name/email. (? lines) + Version 16.123.4: Jan 26, 2017 Surname1 and first name can not be deleted when editing user's data. (212000 lines) Version 16.123.3: Jan 25, 2017 Code refactoring in edition of user's record. (211987 lines) Version 16.123.2: Jan 25, 2017 Teachers can edit names of students/teachers with no name/email. (211989 lines) Version 16.123.1: Jan 20, 2017 Minor change in text to show agenda. (211952 lines) diff --git a/swad_record.c b/swad_record.c index 9fa7b1c0a..e33a20814 100644 --- a/swad_record.c +++ b/swad_record.c @@ -3583,15 +3583,28 @@ Rol_Role_t Rec_GetRoleFromRecordForm (void) void Rec_GetUsrNameFromRecordForm (struct UsrData *UsrDat) { - Par_GetParToText ("Surname1",UsrDat->Surname1,Usr_MAX_BYTES_NAME); - Str_ConvertToTitleType (UsrDat->Surname1); + char Surname1 [Usr_MAX_BYTES_NAME + 1]; // Temporary surname 1 + char FirstName[Usr_MAX_BYTES_NAME + 1]; // Temporary first name + /***** Get surname 1 *****/ + Par_GetParToText ("Surname1",Surname1,Usr_MAX_BYTES_NAME); + Str_ConvertToTitleType (Surname1); + // Surname 1 is mandatory, so avoid overwriting surname 1 with empty string + if (Surname1[0]) // New surname 1 not empty + Str_Copy (UsrDat->Surname1,Surname1,Usr_MAX_BYTES_NAME); + + /***** Get surname 2 *****/ Par_GetParToText ("Surname2",UsrDat->Surname2,Usr_MAX_BYTES_NAME); Str_ConvertToTitleType (UsrDat->Surname2); - Par_GetParToText ("FirstName",UsrDat->FirstName,Usr_MAX_BYTES_NAME); - Str_ConvertToTitleType (UsrDat->FirstName); + /***** Get first name *****/ + Par_GetParToText ("FirstName",FirstName,Usr_MAX_BYTES_NAME); + Str_ConvertToTitleType (FirstName); + // First name is mandatory, so avoid overwriting first name with empty string + if (Surname1[0]) // New first name not empty + Str_Copy (UsrDat->FirstName,FirstName,Usr_MAX_BYTES_NAME); + /***** Build full name *****/ Usr_BuildFullName (UsrDat); }