diff --git a/swad_assignment.c b/swad_assignment.c index 0744fee10..798000e97 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -167,9 +167,6 @@ static void Asg_ShowAllAssignments (void) if (Asg_CheckIfICanCreateAssignments ()) Asg_PutButtonToCreateNewAsg (); - /***** Put link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** End box *****/ Box_EndBox (); diff --git a/swad_changelog.h b/swad_changelog.h index c18a484d5..66533ba07 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -256,13 +256,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 17.21.5 (2017-10-08)" +#define Log_PLATFORM_VERSION "SWAD 17.21.6 (2017-10-08)" #define CSS_FILE "swad17.0.css" #define JS_FILE "swad17.17.1.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 17.21.6: Oct 08, 2017 Changes related with project file browsers. (233315 lines) Version 17.21.5: Oct 08, 2017 Code refactoring in removal of files from database when removing course. (233317 lines) Version 17.21.4: Oct 08, 2017 Fixed bug: remove group files from database when removing course. Removed project files from database when removing course. diff --git a/swad_enrolment.c b/swad_enrolment.c index 0539d5768..baec2e69d 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -156,7 +156,7 @@ static void Enr_EffectivelyRemAdm (struct UsrData *UsrDat,Sco_Scope_t Scope, long Cod,const char *InsCtrDegName); /*****************************************************************************/ -/************ Put button to register students *************/ +/** Check if current course has students and show warning no students found **/ /*****************************************************************************/ void Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (void) @@ -168,7 +168,7 @@ void Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (void) } /*****************************************************************************/ -/************ Put button to register students *************/ +/****************** Put inline button to register students *******************/ /*****************************************************************************/ void Enr_PutButtonInlineToRegisterStds (long CrsCod) @@ -2956,9 +2956,6 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) else // There are no requests Ale_ShowAlert (Ale_INFO,Txt_No_enrolment_requests); - /***** Put link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** End box *****/ Box_EndBox (); } diff --git a/swad_exam.c b/swad_exam.c index 29c0f0797..74d7c8a2f 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -694,9 +694,6 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx if (ICanEdit) Exa_PutButtonToCreateNewExamAnnouncement (); - /***** Put link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** End box *****/ Box_EndBox (); } diff --git a/swad_file_browser.c b/swad_file_browser.c index 5755301ee..b18f0365c 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1134,9 +1134,9 @@ static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] = #define Brw_MAX_FILES_WORKS_PER_STD 500 #define Brw_MAX_FOLDS_WORKS_PER_STD 50 -#define Brw_MAX_QUOTA_PRJ ( 2ULL*Brw_GiB) -#define Brw_MAX_FILES_PRJ 500 -#define Brw_MAX_FOLDS_PRJ 50 +#define Brw_MAX_QUOTA_DOC_PRJ ( 1ULL*Brw_GiB) +#define Brw_MAX_FILES_DOC_PRJ 500 +#define Brw_MAX_FOLDS_DOC_PRJ 50 #define Brw_MAX_QUOTA_MARKS_CRS ( 1ULL*Brw_GiB) #define Brw_MAX_FILES_MARKS_CRS 500 @@ -3203,9 +3203,9 @@ static void Brw_SetMaxQuota (void) Gbl.FileBrowser.Size.MaxFolds = Brw_MAX_FOLDS_WORKS_PER_STD; break; case Brw_ADMI_DOC_PRJ: - Gbl.FileBrowser.Size.MaxQuota = Brw_MAX_QUOTA_PRJ; - Gbl.FileBrowser.Size.MaxFiles = Brw_MAX_FILES_PRJ; - Gbl.FileBrowser.Size.MaxFolds = Brw_MAX_FOLDS_PRJ; + Gbl.FileBrowser.Size.MaxQuota = Brw_MAX_QUOTA_DOC_PRJ; + Gbl.FileBrowser.Size.MaxFiles = Brw_MAX_FILES_DOC_PRJ; + Gbl.FileBrowser.Size.MaxFolds = Brw_MAX_FOLDS_DOC_PRJ; break; case Brw_SHOW_MRK_CRS: case Brw_ADMI_MRK_CRS: @@ -3369,10 +3369,19 @@ static void Brw_ShowFileBrowserProject (void) /***** Show the project *****/ Prj_ShowOneUniqueProject (&Prj); - /***** Show project documents *****/ + /***** Show project file browsers *****/ if (Prj_CheckIfICanAdminDocsProject (Prj.PrjCod)) { Brw_WriteTopBeforeShowingFileBrowser (); + + /***** Show the tree with the project documents *****/ + Gbl.FileBrowser.Type = Brw_ADMI_DOC_PRJ; + Brw_InitializeFileBrowser (); + Brw_ShowFileBrowser (); + + /***** Show the tree with the project assessment *****/ + Gbl.FileBrowser.Type = Brw_ADMI_DOC_PRJ; + Brw_InitializeFileBrowser (); Brw_ShowFileBrowser (); } else diff --git a/swad_notice.c b/swad_notice.c index 553b038e5..c92256065 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -463,9 +463,6 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing) if (Not_CheckIfICanEditNotices ()) Not_PutButtonToAddNewNotice (); - /***** Put link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** End box *****/ Box_EndBox (); break; diff --git a/swad_project.c b/swad_project.c index 92633a401..d3996ed74 100644 --- a/swad_project.c +++ b/swad_project.c @@ -281,9 +281,6 @@ static void Prj_ShowProjectsInCurrentPage (void) if (Prj_CheckIfICanCreateProjects ()) Prj_PutButtonToCreateNewPrj (); - /***** Put link to register students *****/ - Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); - /***** End box *****/ Box_EndBox ();