Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.194.6

This commit is contained in:
Antonio Cañas Vargas 2017-04-28 10:44:28 +02:00
parent d2a5992a70
commit 5b89ff574d
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swad_agenda.c
View File

@ -1319,17 +1319,16 @@ void Agd_AskRemEvent (void)
AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod;
Agd_GetDataOfEventByCod (&AgdEvent);
/***** Button of confirmation of removing *****/
Act_FormStart (ActRemEvtMyAgd);
Gbl.Agenda.AgdCodToEdit = AgdEvent.AgdCod;
Agd_PutCurrentParamsMyAgenda ();
/***** Ask for confirmation of removing *****/
/***** Show question and button to remove event *****/
/* Start alert */
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_event_X,
AgdEvent.Event);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Lay_PutRemoveButton (Txt_Remove_event);
Act_FormEnd ();
AgdEvent.Event);
Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message);
/* End alert */
Gbl.Agenda.AgdCodToEdit = AgdEvent.AgdCod;
Lay_ShowAlertAndButton2 (ActRemEvtMyAgd,NULL,Agd_PutCurrentParamsMyAgenda,
Lay_REMOVE_BUTTON,Txt_Remove_event);
/***** Show events again *****/
Agd_ShowMyAgenda ();

2
swad_assignment.c
View File

@ -908,7 +908,6 @@ void Asg_ReqRemAssignment (void)
/***** Get data of the assignment from database *****/
Asg_GetDataOfAssignmentByCod (&Asg);
Gbl.Asgs.AsgCodToEdit = Asg.AsgCod;
/***** Show question and button to remove the assignment *****/
/* Start alert */
@ -917,6 +916,7 @@ void Asg_ReqRemAssignment (void)
Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message);
/* End alert */
Gbl.Asgs.AsgCodToEdit = Asg.AsgCod;
Lay_ShowAlertAndButton2 (ActRemAsg,NULL,Asg_PutParams,
Lay_REMOVE_BUTTON,Txt_Remove_assignment);

7
swad_changelog.h
View File

@ -221,15 +221,16 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.194.5 (2017-04-28)"
#define Log_PLATFORM_VERSION "SWAD 16.194.6 (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.5: Apr 28, 2017 Changed dialog to remove forum thread. (218347 lines)
Version 16.194.4: Apr 28, 2017 Changed dialog to remove assignment. (218332 lines)
Version 16.194.6: Apr 28, 2017 Changed dialog to remove an agenda event. (218347 lines)
Version 16.194.5: Apr 28, 2017 Changed dialog to remove a forum thread. (218347 lines)
Version 16.194.4: Apr 28, 2017 Changed dialog to remove an assignment. (218332 lines)
Version 16.194.3: Apr 28, 2017 Changed dialog to remove all students in course. (218340 lines)
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)