From dc577e7fcaba4c7163537cade9d9865a2689edc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 28 Apr 2017 09:43:32 +0200 Subject: [PATCH] Version 16.194.2 --- swad_changelog.h | 3 ++- swad_enrolment.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index ca216c35f..16953feca 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,13 +221,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.194.1 (2017-04-28)" +#define Log_PLATFORM_VERSION "SWAD 16.194.2 (2017-04-28)" #define CSS_FILE "swad16.193.4.css" #define JS_FILE "swad16.181.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.194.2: Apr 28, 2017 Changed dialog to reject user's enrolment request. (218336 lines) Version 16.194.1: Apr 28, 2017 Changed dialog to register user as administrator. (218335 lines) Version 16.194: Apr 28, 2017 Fixed bugs in filtering sent and received messages. (218332 lines) Version 16.193.8: Apr 28, 2017 Changed dialog to remove messages. (218299 lines) diff --git a/swad_enrolment.c b/swad_enrolment.c index 70696d4c9..41dd1a325 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2010,7 +2010,7 @@ void Enr_GetNotifEnrolmentRequest (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], } /*****************************************************************************/ -/****** Ask if reject the request for enrolment of a user in a course *******/ +/******* Ask if reject the request for enrolment of a user in a course *******/ /*****************************************************************************/ void Enr_AskIfRejectSignUp (void) @@ -2047,20 +2047,20 @@ void Enr_AskIfRejectSignUp (void) if (Role == Rol_STUDENT || Role == Rol_TEACHER) { - /* Ask if reject */ + /***** Show question and button to reject user's enrolment request *****/ + /* Start alert */ sprintf (Gbl.Message,Txt_Do_you_really_want_to_reject_the_enrolment_request_, Gbl.Usrs.Other.UsrDat.FullName, Txt_ROLES_SINGUL_abc[Role][Gbl.Usrs.Other.UsrDat.Sex], Gbl.CurrentCrs.Crs.FullName); - Lay_ShowAlert (Lay_INFO,Gbl.Message); + Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message); + + /* Show user's record */ Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); - /* Button to confirm rejection */ - Act_FormStart (ActRejSignUp); - Usr_PutParamOtherUsrCodEncrypted (); - - Lay_PutConfirmButton (Txt_Reject); - Act_FormEnd (); + /* End alert */ + Lay_ShowAlertAndButton2 (ActRejSignUp,Usr_PutParamOtherUsrCodEncrypted, + Lay_REMOVE_BUTTON,Txt_Reject); } else Lay_ShowErrorAndExit ("Wrong role."); @@ -3518,7 +3518,7 @@ static void Enr_ReqAddAdm (Sco_Scope_t Scope,long Cod,const char *InsCtrDegName) /* End alert */ Lay_ShowAlertAndButton2 (Enr_ActNewAdm[Scope],Usr_PutParamOtherUsrCodEncrypted, - Lay_CONFIRM_BUTTON,Txt_Register_user_IN_A_COURSE_OR_DEGREE); + Lay_CREATE_BUTTON,Txt_Register_user_IN_A_COURSE_OR_DEGREE); } } else