Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.68.1

This commit is contained in:
Antonio Cañas Vargas 2015-01-25 21:18:49 +01:00
parent 8fe68819d6
commit 6d8385555d
2 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swad_changelog.h
View File

@ -39,11 +39,25 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.68 (2015/01/25)"
#define Log_PLATFORM_VERSION "SWAD 14.68.1 (2015/01/25)"
// 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 | tail -1
/*
TODO: Chequear que no debe haber documentos abiertos en los grupos (no tiene sentido)
Comprobar que no se pueden crear
Comprobar que se pueden buscar documentos abiertos en titulaciones, centros e instituciones
Version 14.68.1: Jan 25, 2015 Changes in codes stores in expanded_folders table. (175618 lines)
7 changes necessary in database:
UPDATE expanded_folders SET FileBrowser='3' WHERE FileBrowser='1';
UPDATE expanded_folders SET FileBrowser='8' WHERE FileBrowser='2';
UPDATE expanded_folders SET FileBrowser='11' WHERE FileBrowser='10';
UPDATE expanded_folders SET FileBrowser='13' WHERE FileBrowser='12';
UPDATE expanded_folders SET FileBrowser='17' WHERE FileBrowser='16';
UPDATE expanded_folders SET FileBrowser='19' WHERE FileBrowser='18';
UPDATE expanded_folders SET FileBrowser='21' WHERE FileBrowser='20';
Version 14.68: Jan 25, 2015 Changes in file_browser_size table. (175606 lines)
8 changes necessary in database:
DROP INDEX FileBrowser ON file_browser_size;

64
swad_file_browser.c
View File

@ -151,27 +151,27 @@ static const Brw_FileBrowser_t Brw_FileBrowserForDB_clipboard[Brw_NUM_TYPES_FILE
static const Brw_FileBrowser_t Brw_FileBrowserForDB_expanded_folders[Brw_NUM_TYPES_FILE_BROWSER] =
{
Brw_FILE_BRW_UNKNOWN, // Brw_FILE_BRW_UNKNOWN
Brw_FILE_BRW_SEE_DOCUMENTS_CRS, // Brw_FILE_BRW_SEE_DOCUMENTS_CRS
Brw_FILE_BRW_SEE_MARKS_CRS, // Brw_FILE_BRW_SEE_MARKS_CRS
Brw_FILE_BRW_SEE_DOCUMENTS_CRS, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS
Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS, // Brw_FILE_BRW_SEE_DOCUMENTS_CRS
Brw_FILE_BRW_ADMIN_MARKS_CRS, // Brw_FILE_BRW_SEE_MARKS_CRS
Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS
Brw_FILE_BRW_COMMON_CRS, // Brw_FILE_BRW_COMMON_CRS
Brw_FILE_BRW_COMMON_GRP, // Brw_FILE_BRW_COMMON_GRP
Brw_FILE_BRW_WORKS_USR, // Brw_FILE_BRW_WORKS_USR
Brw_FILE_BRW_WORKS_CRS, // Brw_FILE_BRW_WORKS_CRS
Brw_FILE_BRW_SEE_MARKS_CRS, // Brw_FILE_BRW_ADMIN_MARKS_CRS
Brw_FILE_BRW_ADMIN_MARKS_CRS, // Brw_FILE_BRW_ADMIN_MARKS_CRS
Brw_FILE_BRW_BRIEFCASE_USR, // Brw_FILE_BRW_BRIEFCASE_USR
Brw_FILE_BRW_SEE_DOCUMENTS_GRP, // Brw_FILE_BRW_SEE_DOCUMENTS_GRP
Brw_FILE_BRW_SEE_DOCUMENTS_GRP, // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP
Brw_FILE_BRW_SEE_MARKS_GRP, // Brw_FILE_BRW_SEE_MARKS_GRP
Brw_FILE_BRW_SEE_MARKS_GRP, // Brw_FILE_BRW_ADMIN_MARKS_GRP
Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, // Brw_FILE_BRW_SEE_DOCUMENTS_GRP
Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP
Brw_FILE_BRW_ADMIN_MARKS_GRP, // Brw_FILE_BRW_SEE_MARKS_GRP
Brw_FILE_BRW_ADMIN_MARKS_GRP, // Brw_FILE_BRW_ADMIN_MARKS_GRP
Brw_FILE_BRW_ASSIGNMENTS_USR, // Brw_FILE_BRW_ASSIGNMENTS_USR
Brw_FILE_BRW_ASSIGNMENTS_CRS, // Brw_FILE_BRW_ASSIGNMENTS_CRS
Brw_FILE_BRW_SEE_DOCUMENTS_DEG, // Brw_FILE_BRW_SEE_DOCUMENTS_DEG
Brw_FILE_BRW_SEE_DOCUMENTS_DEG, // Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG
Brw_FILE_BRW_SEE_DOCUMENTS_CTR, // Brw_FILE_BRW_SEE_DOCUMENTS_CTR
Brw_FILE_BRW_SEE_DOCUMENTS_CTR, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR
Brw_FILE_BRW_SEE_DOCUMENTS_INS, // Brw_FILE_BRW_SEE_DOCUMENTS_INS
Brw_FILE_BRW_SEE_DOCUMENTS_INS, // Brw_FILE_BRW_ADMIN_DOCUMENTS_INS
Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG, // Brw_FILE_BRW_SEE_DOCUMENTS_DEG
Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG, // Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG
Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR, // Brw_FILE_BRW_SEE_DOCUMENTS_CTR
Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR
Brw_FILE_BRW_ADMIN_DOCUMENTS_INS, // Brw_FILE_BRW_SEE_DOCUMENTS_INS
Brw_FILE_BRW_ADMIN_DOCUMENTS_INS, // Brw_FILE_BRW_ADMIN_DOCUMENTS_INS
};
// Browsers types for database "file_browser_last" table
// Assignments and works are stored as one in file_browser_last...
@ -3513,7 +3513,7 @@ void Brw_RemoveInsFilesFromDB (long InsCod)
/***** Remove from database expanded folders *****/
sprintf (Query,"DELETE LOW_PRIORITY FROM expanded_folders"
" WHERE FileBrowser='%u' AND Cod='%ld'",
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_INS,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_INS,
InsCod);
DB_QueryDELETE (Query,"can not remove expanded folders of an institution");
@ -3565,7 +3565,7 @@ void Brw_RemoveCtrFilesFromDB (long CtrCod)
/***** Remove from database expanded folders *****/
sprintf (Query,"DELETE LOW_PRIORITY FROM expanded_folders"
" WHERE FileBrowser='%u' AND Cod='%ld'",
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_CTR,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR,
CtrCod);
DB_QueryDELETE (Query,"can not remove expanded folders of a centre");
@ -3617,7 +3617,7 @@ void Brw_RemoveDegFilesFromDB (long DegCod)
/***** Remove from database expanded folders *****/
sprintf (Query,"DELETE LOW_PRIORITY FROM expanded_folders"
" WHERE FileBrowser='%u' AND Cod='%ld'",
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_DEG,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG,
DegCod);
DB_QueryDELETE (Query,"can not remove expanded folders of a degree");
@ -3685,13 +3685,13 @@ void Brw_RemoveCrsFilesFromDB (long CrsCod)
sprintf (Query,"DELETE LOW_PRIORITY FROM expanded_folders"
" WHERE FileBrowser IN ('%u','%u','%u','%u','%u','%u','%u')"
" AND Cod='%ld'",
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS,
(unsigned) Brw_FILE_BRW_ASSIGNMENTS_USR,
(unsigned) Brw_FILE_BRW_ASSIGNMENTS_CRS,
(unsigned) Brw_FILE_BRW_WORKS_USR,
(unsigned) Brw_FILE_BRW_WORKS_CRS,
(unsigned) Brw_FILE_BRW_SEE_MARKS_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_CRS,
CrsCod);
DB_QueryDELETE (Query,"can not remove expanded folders of a course");
@ -3779,9 +3779,9 @@ void Brw_RemoveGrpFilesFromDB (long GrpCod)
sprintf (Query,"DELETE LOW_PRIORITY FROM expanded_folders"
" WHERE FileBrowser IN ('%u','%u','%u')"
" AND Cod='%ld'",
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP,
(unsigned) Brw_FILE_BRW_SEE_MARKS_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP,
GrpCod);
DB_QueryDELETE (Query,"can not remove expanded folders of a group");
@ -3844,17 +3844,17 @@ void Brw_RemoveSomeInfoAboutCrsUsrFilesFromDB (long CrsCod,long UsrCod)
" AND Cod IN (SELECT GrpCod FROM crs_grp WHERE CrsCod='%ld'))"
")",
UsrCod,
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS,
(unsigned) Brw_FILE_BRW_ASSIGNMENTS_USR,
(unsigned) Brw_FILE_BRW_ASSIGNMENTS_CRS,
(unsigned) Brw_FILE_BRW_WORKS_USR,
(unsigned) Brw_FILE_BRW_WORKS_CRS,
(unsigned) Brw_FILE_BRW_SEE_MARKS_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_CRS,
CrsCod,
(unsigned) Brw_FILE_BRW_SEE_DOCUMENTS_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP,
(unsigned) Brw_FILE_BRW_SEE_MARKS_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP,
CrsCod);
DB_QueryDELETE (Query,"can not remove expanded folders for a user in a course");
@ -6683,23 +6683,23 @@ static long Brw_GetCodForExpandedFolders (void)
{
switch (Brw_FileBrowserForDB_expanded_folders[Gbl.FileBrowser.Type])
{
case Brw_FILE_BRW_SEE_DOCUMENTS_INS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_INS:
return Gbl.CurrentIns.Ins.InsCod;
case Brw_FILE_BRW_SEE_DOCUMENTS_CTR:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR:
return Gbl.CurrentCtr.Ctr.CtrCod;
case Brw_FILE_BRW_SEE_DOCUMENTS_DEG:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG:
return Gbl.CurrentDeg.Deg.DegCod;
case Brw_FILE_BRW_SEE_DOCUMENTS_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS:
case Brw_FILE_BRW_COMMON_CRS:
case Brw_FILE_BRW_ASSIGNMENTS_USR:
case Brw_FILE_BRW_ASSIGNMENTS_CRS:
case Brw_FILE_BRW_WORKS_USR:
case Brw_FILE_BRW_WORKS_CRS:
case Brw_FILE_BRW_SEE_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_CRS:
return Gbl.CurrentCrs.Crs.CrsCod;
case Brw_FILE_BRW_SEE_DOCUMENTS_GRP:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP:
case Brw_FILE_BRW_COMMON_GRP:
case Brw_FILE_BRW_SEE_MARKS_GRP:
case Brw_FILE_BRW_ADMIN_MARKS_GRP:
return Gbl.CurrentCrs.Grps.GrpCod;
default:
return -1L;