From 75061c2cdb53741fc23af8d755dbce4886588bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 13 Oct 2019 17:58:50 +0200 Subject: [PATCH] Version19.33.5 --- swad_changelog.h | 3 ++- swad_file_browser.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 02e89f9f3..1245e5504 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.33.4 (2019-10-13)" +#define Log_PLATFORM_VERSION "SWAD 19.33.5 (2019-10-13)" #define CSS_FILE "swad19.33.css" #define JS_FILE "swad19.30.js" /* @@ -496,6 +496,7 @@ ps2pdf source.ps destination.pdf // TODO: En un TFG no preasignado con estudiante tiene que salir un triángulo amarillo // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.33.5: Oct 13, 2019 Fixed bug in file browser. (245298 lines) Version 19.33.4: Oct 13, 2019 Code refactoring in HTML table headings. (245291 lines) Version 19.33.3: Oct 13, 2019 Code refactoring in HTML table headings. (245499 lines) Version 19.33.2: Oct 13, 2019 Code refactoring in HTML table headings. (245646 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 664f9a5d5..0066c0909 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -5545,21 +5545,27 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, if (asprintf (&Anchor,"fil_brw_%u_%s", Gbl.FileBrowser.Id,RowId) < 0) Lay_NotEnoughMemoryExit (); - Tbl_TR_Begin ("id=\"%s\"",Anchor); switch (IconThisRow) { case Brw_ICON_TREE_NOTHING: + if (TreeContracted) // This row is inside a contracted subtree + Tbl_TR_Begin ("id=\"%s\" style=\"display:none;\"",Anchor); + else + Tbl_TR_Begin ("id=\"%s\"",Anchor); break; case Brw_ICON_TREE_EXPAND: - fprintf (Gbl.F.Out," data-folder=\"contracted\""); + if (TreeContracted) // This row is inside a contracted subtree + Tbl_TR_Begin ("id=\"%s\" data-folder=\"contracted\" style=\"display:none;\"",Anchor); + else + Tbl_TR_Begin ("id=\"%s\" data-folder=\"contracted\"",Anchor); break; case Brw_ICON_TREE_CONTRACT: - fprintf (Gbl.F.Out," data-folder=\"expanded\""); + if (TreeContracted) // This row is inside a contracted subtree + Tbl_TR_Begin ("id=\"%s\" data-folder=\"expanded\" style=\"display:none;\"",Anchor); + else + Tbl_TR_Begin ("id=\"%s\" data-folder=\"expanded\"",Anchor); break; } - if (TreeContracted) // This row is inside a contracted subtree - fprintf (Gbl.F.Out," style=\"display:none;\""); - fprintf (Gbl.F.Out,">"); /****** If current action allows file administration... ******/ Gbl.FileBrowser.ICanEditFileOrFolder = false;