Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-28 20:43:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.91.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-07 02:03:43 +01:00
parent 02d793f40e
commit a6d2d2339b
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_action.c
View File

@ -2788,8 +2788,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
/* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"hierarchy64x64.png" },
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
// /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, // TODO: Remove when debugged
// /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, // TODO: Remove when debugged
/* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },

5
swad_changelog.h
View File

@ -179,17 +179,20 @@
// TODO: When teacher sees "No hay estudiantes", put a button to add students
// TODO: When admin sees "No hay profesores", put a button to add teachers
// TODO: Fix bug in notification content about files sent to plugins like SWADroid: do not write internal name (for example "comun"). Call instead Brw_GetFileNameToShow or similar.
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.91 (2016-12-07)"
#define Log_PLATFORM_VERSION "SWAD 16.91.1 (2016-12-07)"
#define CSS_FILE "swad16.86.5.css"
#define JS_FILE "swad16.90.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.91.1: Dec 07, 2016 Fixed bug in notifications. (210192 lines)
Version 16.91: Dec 07, 2016 Changes in QR codes. (210204 lines)
Version 16.90.3: Dec 06, 2016 Changes related with agenda QR. (210156 lines)
1 change necessary in database:

22
swad_file_browser.c
View File

@ -11371,12 +11371,9 @@ void Brw_GetSummaryAndContentOfFile (char *SummaryStr,char **ContentStr,
extern const char *Txt_Folder;
extern const char *Txt_Uploaded_by;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_File_size;
struct FileMetadata FileMetadata;
bool Found;
bool FileHasPublisher;
struct UsrData PublisherUsrDat;
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING];
/***** Return nothing on error *****/
SummaryStr[0] = '\0'; // Return nothing on error
@ -11387,11 +11384,6 @@ void Brw_GetSummaryAndContentOfFile (char *SummaryStr,char **ContentStr,
FileMetadata.FilCod = FilCod;
Brw_GetFileMetadataByCod (&FileMetadata);
/***** Get file type, size and date *****/
Gbl.FileBrowser.Type = FileMetadata.FileBrowser;
Brw_SetPathFileBrowser ();
Found = Brw_GetFileTypeSizeAndDate (&FileMetadata);
/***** Copy file name into summary string *****/
strcpy (SummaryStr,FileMetadata.FilFolLnkName);
if (MaxChars)
@ -11414,21 +11406,13 @@ void Brw_GetSummaryAndContentOfFile (char *SummaryStr,char **ContentStr,
/* Unknown publisher */
FileHasPublisher = false;
/* File size */
if (Found)
Fil_WriteFileSizeFull ((double) FileMetadata.Size,FileSizeStr);
/* Fill content string */
sprintf (*ContentStr,"%s: %s<br />" // File name
"%s: %s<br />" // File path
"%s: %s<br />" // Publisher
"%s: %s", // File size
"%s: %s", // Publisher
Txt_Filename,FileMetadata.FilFolLnkName,
Txt_Folder,FileMetadata.PathInTreeUntilFilFolLnk,
Txt_Folder,FileMetadata.PathInTreeUntilFilFolLnk, // TODO: Fix bug: do not write internal name (for example "comun")
Txt_Uploaded_by,FileHasPublisher ? PublisherUsrDat.FullName :
Txt_ROLES_SINGUL_Abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN],
Txt_File_size,Found ? FileSizeStr :
"Not found");
Txt_ROLES_SINGUL_Abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN]);
/* Free memory used for publisher's data */
if (FileMetadata.PublisherUsrCod > 0)