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.194.9

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-04-28 11:53:46 +02:00
parent 3723c4a7d3
commit 7eb2575721
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -221,13 +221,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.194.8 (2017-04-28)"
#define Log_PLATFORM_VERSION "SWAD 16.194.9 (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.9: Apr 28, 2017 Changed dialog to remove a non empty folder. (218379 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)

28
swad_file_browser.c
View File

@ -1533,6 +1533,7 @@ 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_PutParamsRemFolder (void);
static void Brw_WriteCurrentClipboard (void);
@ -6214,7 +6215,7 @@ void Brw_AskRemFileFromTree (void)
}
/*****************************************************************************/
/************************ Remove a file of a file browser ********************/
/*********************** Put params to remove a file/link ********************/
/*****************************************************************************/
static void Brw_PutParamsRemFile (void)
@ -6341,17 +6342,28 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
extern const char *Txt_Do_you_really_want_to_remove_the_folder_X;
extern const char *Txt_Remove_folder;
/***** Form to remove a not empty folder *****/
Act_FormStart (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type]);
/***** Show question and button to remove not empty folder *****/
/* Start alert */
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_folder_X,
Gbl.FileBrowser.FilFolLnkName);
Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message);
/* End alert */
Lay_ShowAlertAndButton2 (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],NULL,
Brw_PutParamsRemFolder,
Lay_REMOVE_BUTTON,Txt_Remove_folder);
}
/*****************************************************************************/
/************************ Put params to remove a folder **********************/
/*****************************************************************************/
static void Brw_PutParamsRemFolder (void)
{
Brw_PutParamsFileBrowser (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L);
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_folder_X,
Gbl.FileBrowser.FilFolLnkName);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Lay_PutRemoveButton (Txt_Remove_folder);
Act_FormEnd ();
}
/*****************************************************************************/