From 5d43b34773b88fd543cbaa3b3f2accf8296eb7da Mon Sep 17 00:00:00 2001 From: acanas Date: Fri, 7 Oct 2022 00:18:32 +0200 Subject: [PATCH] Version 22.41.1: Oct 07, 2022 Fixed issue in main title. --- swad_changelog.h | 3 ++- swad_hierarchy.c | 22 +++++++++++----------- swad_user.c | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 0069ac8dd..19b4edcc6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate TODO: Attach pdf files in multimedia. */ -#define Log_PLATFORM_VERSION "SWAD 22.41 (2022-10-06)" +#define Log_PLATFORM_VERSION "SWAD 22.41.1 (2022-10-07)" #define CSS_FILE "swad22.40.css" #define JS_FILE "swad21.100.js" /* + Version 22.41.1: Oct 07, 2022 Fixed issue in main title. (332512 lines) Version 22.41: Oct 06, 2022 Changes in the behavior of the expansion/contraction of program items. (332511 lines) Version 22.40: Oct 04, 2022 Link in main title. (332514 lines) Version 22.39.5: Oct 03, 2022 Fixed bug in edition of course program. (332513 lines) diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 02c14f13e..a39e658b3 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -412,16 +412,15 @@ void Hie_WriteHierarchyInBreadcrumb (void) void Hie_WriteBigNameCtyInsCtrDegCrs (void) { - extern const char *Txt_Actions[Act_NUM_ACTIONS]; - static Act_Action_t NextAction[HieLvl_NUM_LEVELS] = + static Tab_Tab_t NextTab[HieLvl_NUM_LEVELS] = { - [HieLvl_UNK] = ActUnk, // Unknown - [HieLvl_SYS] = ActSeeCty, // System ==> list countries - [HieLvl_CTY] = ActSeeIns, // Country ==> list institutions - [HieLvl_INS] = ActSeeCtr, // Institution ==> list centers - [HieLvl_CTR] = ActSeeDeg, // Center ==> list degrees - [HieLvl_DEG] = ActSeeCrs, // Degree ==> list courses - [HieLvl_CRS] = ActSeePrg, // Course ==> see program + [HieLvl_UNK] = TabUnk, + [HieLvl_SYS] = TabSys, + [HieLvl_CTY] = TabCty, + [HieLvl_INS] = TabIns, + [HieLvl_CTR] = TabCtr, + [HieLvl_DEG] = TabDeg, + [HieLvl_CRS] = TabCrs, }; const char *FullText[HieLvl_NUM_LEVELS] = { @@ -448,8 +447,9 @@ void Hie_WriteBigNameCtyInsCtrDegCrs (void) /***** Logo and text *****/ HTM_DIV_Begin ("id=\"big_name_container\""); - Frm_BeginFormGoTo (NextAction[Gbl.Hierarchy.Level]); - HTM_BUTTON_Submit_Begin (Txt_Actions[NextAction[Gbl.Hierarchy.Level]], + Frm_BeginForm (ActMnu); + Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NextTab[Gbl.Hierarchy.Level]); + HTM_BUTTON_Submit_Begin (ShrtText[Gbl.Hierarchy.Level], "class=\"BT_LINK ICO_HIGHLIGHT\""); HTM_DIV_Begin ("id=\"big_full_name\""); // Full name diff --git a/swad_user.c b/swad_user.c index b07bb1ac8..caf5cc8b2 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1730,7 +1730,7 @@ void Usr_ChkUsrAndGetUsrData (void) Action = Mnu_GetFirstActionAvailableInCurrentTab (); Gbl.Action.Act = (Action == ActUnk) ? ((Gbl.Usrs.Me.Logged) ? ActSeeGblTL : // Default action if logged - ActFrmLogIn) : // Default action if not logged + ActFrmLogIn) : // Default action if not logged Action; Tab_SetCurrentTab (); }