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

Version 16.194.8

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-04-28 11:47:30 +02:00
parent 42963cc652
commit 3723c4a7d3
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -221,14 +221,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.194.7 (2017-04-28)"
#define Log_PLATFORM_VERSION "SWAD 16.194.8 (2017-04-28)"
#define CSS_FILE "swad16.193.4.css"
#define JS_FILE "swad16.181.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.194.7: Apr 28, 2017 Changed dialog to remove record field. (218359 lines)
Version 16.194.8: Apr 28, 2017 Changed dialog to remove a file/link. (218369 lines)
Version 16.194.7: Apr 28, 2017 Changed dialog to remove a record field. (218359 lines)
Version 16.194.6: Apr 28, 2017 Changed dialog to remove an agenda event. (218347 lines)
Version 16.194.5: Apr 28, 2017 Changed dialog to remove a forum thread. (218347 lines)
Version 16.194.4: Apr 28, 2017 Changed dialog to remove an assignment. (218332 lines)

35
swad_file_browser.c
View File

@ -1531,6 +1531,7 @@ static void Brw_GetFileNameToShow (Brw_FileType_t FileType,
static void Brw_WriteDatesAssignment (void);
static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata);
static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod);
static void Brw_PutParamsRemFile (void);
static void Brw_AskConfirmRemoveFolderNotEmpty (void);
static void Brw_WriteCurrentClipboard (void);
@ -6189,25 +6190,21 @@ void Brw_AskRemFileFromTree (void)
/***** Button of confirmation of removing *****/
if (Brw_CheckIfICanEditFileOrFolder (Gbl.FileBrowser.Level)) // Can I remove this file?
{
/***** Form to ask for confirmation to remove a file *****/
Act_FormStart (Brw_ActRemoveFile[Gbl.FileBrowser.Type]);
Brw_PutParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
Gbl.FileBrowser.FileType,-1L);
/* Show question */
/***** Show question and button to remove file/link *****/
/* Start alert */
Brw_GetFileNameToShowDependingOnLevel (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Level,
Gbl.FileBrowser.FileType,
Gbl.FileBrowser.FilFolLnkName,FileNameToShow);
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_FILE_OR_LINK_X,
FileNameToShow);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message);
Lay_PutRemoveButton (Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link);
Act_FormEnd ();
/* End alert */
Lay_ShowAlertAndButton2 (Brw_ActRemoveFile[Gbl.FileBrowser.Type],NULL,
Brw_PutParamsRemFile,
Lay_REMOVE_BUTTON,
Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link);
}
else
Lay_ShowErrorAndExit (Txt_You_can_not_remove_this_file_or_link);
@ -6220,6 +6217,18 @@ void Brw_AskRemFileFromTree (void)
/************************ Remove a file of a file browser ********************/
/*****************************************************************************/
static void Brw_PutParamsRemFile (void)
{
Brw_PutParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
Gbl.FileBrowser.FileType,-1L);
}
/*****************************************************************************/
/************************ Remove a file of a file browser ********************/
/*****************************************************************************/
void Brw_RemFileFromTree (void)
{
extern const char *Txt_FILE_X_removed;