From b7e888addfd5b50d69ef1c52ed7ead15e3b0bc5b Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 9 Sep 2023 12:15:25 +0200 Subject: [PATCH] =?UTF-8?q?Fixed=20bug=20hiding=20documents.=20Reported=20?= =?UTF-8?q?by=20Francisco=20Jos=C3=A9=20Pelayo=20Valle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .settings/language.settings.xml | 2 +- swad_browser.c | 12 ++++++------ swad_browser_database.c | 7 ++++--- swad_browser_database.h | 3 ++- swad_building_database.c | 4 ++-- swad_changelog.h | 4 +++- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index b5a12da2f..0cc70ddb3 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/swad_browser.c b/swad_browser.c index 768702b2e..62556f56b 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -7404,8 +7404,8 @@ void Brw_SetDocumentAsVisible (void) /***** Change file to visible *****/ if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Gbl.FileBrowser.FilFolLnk.Type, - Gbl.FileBrowser.FilFolLnk.Full)) - Brw_DB_HideOrUnhideFileOrFolder (Gbl.FileBrowser.FilFolLnk.Full,false); + Gbl.FileBrowser.FilFolLnk.Full) == HidVis_HIDDEN) + Brw_DB_HideOrUnhideFileOrFolder (Gbl.FileBrowser.FilFolLnk.Full,HidVis_VISIBLE); /***** Remove the affected clipboards *****/ Brw_DB_RemoveAffectedClipboards (Gbl.FileBrowser.Type, @@ -7427,9 +7427,9 @@ void Brw_SetDocumentAsHidden (void) /***** If the file or folder is not already set as hidden in database, set it as hidden *****/ - if (!Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Gbl.FileBrowser.FilFolLnk.Type, - Gbl.FileBrowser.FilFolLnk.Full)) - Brw_DB_HideOrUnhideFileOrFolder (Gbl.FileBrowser.FilFolLnk.Full,true); + if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Gbl.FileBrowser.FilFolLnk.Type, + Gbl.FileBrowser.FilFolLnk.Full) == HidVis_VISIBLE) + Brw_DB_HideOrUnhideFileOrFolder (Gbl.FileBrowser.FilFolLnk.Full,HidVis_HIDDEN); /***** Remove the affected clipboards *****/ Brw_DB_RemoveAffectedClipboards (Gbl.FileBrowser.Type, @@ -7445,7 +7445,7 @@ void Brw_SetDocumentAsHidden (void) /*****************************************************************************/ HidVis_HiddenOrVisible_t Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Brw_FileType_t FileType, - const char *Path) + const char *Path) { MYSQL_RES *mysql_res; MYSQL_ROW row; diff --git a/swad_browser_database.c b/swad_browser_database.c index 9852a0554..07614b183 100644 --- a/swad_browser_database.c +++ b/swad_browser_database.c @@ -2273,7 +2273,8 @@ unsigned Brw_DB_GetNumFileViewsUsr (long UsrCod) /************************ Hide/unhide file or folder *************************/ /*****************************************************************************/ -void Brw_DB_HideOrUnhideFileOrFolder (const char Path[PATH_MAX + 1],bool Hide) +void Brw_DB_HideOrUnhideFileOrFolder (const char Path[PATH_MAX + 1], + HidVis_HiddenOrVisible_t HiddenOrVisible) { long Cod = Brw_GetCodForFileBrowser (); long ZoneUsrCod = Brw_GetZoneUsrCodForFileBrowser (); @@ -2286,8 +2287,8 @@ void Brw_DB_HideOrUnhideFileOrFolder (const char Path[PATH_MAX + 1],bool Hide) " AND Cod=%ld" " AND ZoneUsrCod=%ld" " AND Path='%s'", - Hide ? 'Y' : - 'N', + HiddenOrVisible == HidVis_HIDDEN ? 'Y' : + 'N', (unsigned) Brw_DB_FileBrowserForDB_files[Gbl.FileBrowser.Type], Cod, ZoneUsrCod, diff --git a/swad_browser_database.h b/swad_browser_database.h index 44f10f680..e46c037d0 100644 --- a/swad_browser_database.h +++ b/swad_browser_database.h @@ -98,7 +98,8 @@ unsigned Brw_DB_GetFileViewsFromNonLoggedUsrs (long FilCod); unsigned Brw_DB_GetNumFileViewsUsr (long UsrCod); //------------------------------- Hidden files -------------------------------- -void Brw_DB_HideOrUnhideFileOrFolder (const char Path[PATH_MAX + 1],bool Hide); +void Brw_DB_HideOrUnhideFileOrFolder (const char Path[PATH_MAX + 1], + HidVis_HiddenOrVisible_t HiddenOrVisible); unsigned Brw_DB_CheckIfFileOrFolderIsSetAsHiddenUsingPath (MYSQL_RES **mysql_res, const char *Path); bool Brw_DB_CheckIfFileOrFolderIsSetAsHiddenUsingMetadata (const struct Brw_FileMetadata *FileMetadata); diff --git a/swad_building_database.c b/swad_building_database.c index 20f843ff4..c3a86b135 100644 --- a/swad_building_database.c +++ b/swad_building_database.c @@ -42,7 +42,7 @@ extern struct Globals Gbl; void Bld_DB_CreateBuilding (const struct Bld_Building *Building) { DB_QueryINSERT ("can not create building", - "INSERT INTO buildings" + "INSERT INTO bld_buildings" " (CtrCod,ShortName,FullName,Location)" " VALUES" " (%ld,'%s','%s','%s')", @@ -167,7 +167,7 @@ void Bld_DB_RemoveAllBuildingsInCtr (long CtrCod) { /***** Remove all buildings in center *****/ DB_QueryDELETE ("can not remove buildings", - "DELETE FROM buildings" + "DELETE FROM bld_buildings" " WHERE CtrCod=%ld", CtrCod); } diff --git a/swad_changelog.h b/swad_changelog.h index 314f6dba2..891182b2d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,12 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.120.4 (2023-07-11)" +#define Log_PLATFORM_VERSION "SWAD 22.120.6 (2023-09-09)" #define CSS_FILE "swad22.120.4.css" #define JS_FILE "swad22.49.js" /* + Version 22.120.6: Sep 09, 2023 Fixed bug hiding documents. Reported by Francisco José Pelayo Valle. (337628 lines) + Version 22.120.5: Sep 07, 2023 Fixed bugs in database queries related to buildings. (337625 lines) Version 22.120.4: Jul 11, 2023 Fixed bug in CSS related to global connected. (337624 lines) Version 22.120.3: Jun 21, 2023 Fixed bug in forums. Reported by Raymon Moreno Colina. (337647 lines) Version 22.120.2: Jun 07, 2023 Code refactoring related to cookies and hidden-visible. (337646 lines)