From 5b89ff574ddcc81f2426bb1a55c7cd509dd0d5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 28 Apr 2017 10:44:28 +0200
Subject: [PATCH] Version 16.194.6

---
 swad_agenda.c     | 19 +++++++++----------
 swad_assignment.c |  2 +-
 swad_changelog.h  |  7 ++++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/swad_agenda.c b/swad_agenda.c
index a46f28534..715b77e8b 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -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 ();
diff --git a/swad_assignment.c b/swad_assignment.c
index e1ee47ba0..9130426de 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -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);
 
diff --git a/swad_changelog.h b/swad_changelog.h
index b5259783b..84900b330 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -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)