diff --git a/swad_action.c b/swad_action.c index 74ea536b7..d39c15049 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1646,7 +1646,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeHld */{ 707,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_SeeHolidays ,NULL}, /* ActEdiHld */{ 713,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_EditHolidays ,NULL}, /* ActNewHld */{ 714,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL}, - /* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RemoveHoliday ,NULL}, + /* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_RemoveHoliday1 ,Hld_RemoveHoliday2 ,NULL}, /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL}, /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeHolidayType1 ,Hld_ChangeHolidayType2 ,NULL}, /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeStartDate1 ,Hld_ChangeDate2 ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index e5a1c421f..54ab34582 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -209,13 +209,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.167.6 (2017-03-26)" +#define Log_PLATFORM_VERSION "SWAD 16.167.7 (2017-03-26)" #define CSS_FILE "swad16.166.css" #define JS_FILE "swad16.144.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.167.7: Mar 26, 2017 Changes in edition of holidays. (217674 lines) Version 16.167.6: Mar 26, 2017 Changes in edition of holidays. (217667 lines) Version 16.167.5: Mar 26, 2017 Changes in edition of holidays. (217660 lines) Version 16.167.4: Mar 26, 2017 Changes in edition of holidays. (217643 lines) diff --git a/swad_holiday.c b/swad_holiday.c index c9964d9fa..f5a8e67b0 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -641,7 +641,7 @@ long Hld_GetParamHldCod (void) /******************************* Remove a holiday ****************************/ /*****************************************************************************/ -void Hld_RemoveHoliday (void) +void Hld_RemoveHoliday1 (void) { extern const char *Txt_Holiday_X_removed; char Query[128]; @@ -660,9 +660,16 @@ void Hld_RemoveHoliday (void) DB_QueryDELETE (Query,"can not remove a holiday"); /***** Write message to show the change made *****/ + Gbl.AlertType = Lay_SUCCESS; sprintf (Gbl.Message,Txt_Holiday_X_removed, Hld.Name); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Message); + + } + +void Hld_RemoveHoliday2 (void) + { + /***** Show success message *****/ + Lay_ShowAlert (Gbl.AlertType,Gbl.Message); /***** Show the form again *****/ Hld_EditHolidays (); diff --git a/swad_holiday.h b/swad_holiday.h index 9276974c9..39e5aaa0a 100644 --- a/swad_holiday.h +++ b/swad_holiday.h @@ -81,7 +81,8 @@ void Hld_FreeListHolidays (void); long Hld_GetParamHldCod (void); -void Hld_RemoveHoliday (void); +void Hld_RemoveHoliday1 (void); +void Hld_RemoveHoliday2 (void); void Hld_ChangeHolidayPlace (void);