From b5fcc5929902a284ed07cbf568713fde86dfb0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 6 Dec 2016 13:51:23 +0100 Subject: [PATCH] Version 16.88.1 --- swad_agenda.c | 14 ++++++++++++-- swad_agenda.h | 1 + swad_changelog.h | 3 ++- swad_pagination.c | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/swad_agenda.c b/swad_agenda.c index 28ee26bdc..7b005b185 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -390,6 +390,7 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) Act_FormStart (ActSeeMyAgd); break; } + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_ASG_ATT_OR_SVY_HELP_ORDER[Order],"TIT_TBL",NULL); @@ -515,7 +516,7 @@ static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action) WhichEvents == Gbl.Agenda.WhichEvents ? "PREF_ON" : "PREF_OFF"); Act_FormStart (Action); - Par_PutHiddenParamUnsigned ("WhichEvents",(unsigned) WhichEvents); + Pag_PutHiddenParamWhichEvents (WhichEvents); fprintf (Gbl.F.Out,"", @@ -531,7 +532,16 @@ static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action) } /*****************************************************************************/ -/************* Get whether to show all events or only my events **************/ +/****** Put hidden parameter to show all events or only public events ********/ +/*****************************************************************************/ + +void Pag_PutHiddenParamWhichEvents (Agd_WhichEvents_t WhichEvents) + { + Par_PutHiddenParamUnsigned ("WhichEvents",(unsigned) WhichEvents); + } + +/*****************************************************************************/ +/*********** Get whether to show all events or only public events ************/ /*****************************************************************************/ static void Agd_GetParamWhichEvents (void) diff --git a/swad_agenda.h b/swad_agenda.h index d00e4ebe2..84c9fdcc4 100644 --- a/swad_agenda.h +++ b/swad_agenda.h @@ -81,6 +81,7 @@ void Agd_ShowUsrAgendaAfterLogIn (void); void Agd_ShowUsrAgenda (void); void Agd_ShowMyAgenda (void); +void Pag_PutHiddenParamWhichEvents (Agd_WhichEvents_t WhichEvents); void Agd_PutHiddenParamEventsOrderType (void); void Agd_RequestCreatOrEditEvent (void); void Agd_FreeListEvents (void); diff --git a/swad_changelog.h b/swad_changelog.h index f5f98d391..a5527eb82 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,13 +183,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.88 (2016-12-06)" +#define Log_PLATFORM_VERSION "SWAD 16.88.1 (2016-12-06)" #define CSS_FILE "swad16.86.5.css" #define JS_FILE "swad16.84.2.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.88.1: Dec 06, 2016 Fixed bugs in agenda. (210118 lines) Version 16.88: Dec 06, 2016 Current events in user's agenda are displayed in a highlighted box. (210102 lines) Version 16.87.2: Dec 05, 2016 Icon to edit my agenda. (209987 lines) Version 16.87.1: Dec 05, 2016 Temporary permissions to debug agendas. (209969 lines) diff --git a/swad_pagination.c b/swad_pagination.c index f942d38b0..745a5f453 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -173,6 +173,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (1); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; } @@ -261,6 +262,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (1); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; } @@ -332,6 +334,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (Pagination->LeftPage); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; } @@ -410,6 +413,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (NumPage); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; } @@ -484,6 +488,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (Pagination->RightPage); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; } @@ -555,6 +560,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,long ThrCod,struct P case Pag_MY_AGENDA: Act_FormStart (ActSeeMyAgd); Pag_PutHiddenParamPagNum (Pagination->NumPags); + Pag_PutHiddenParamWhichEvents (Gbl.Agenda.WhichEvents); Agd_PutHiddenParamEventsOrderType (); break; }