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 17.24.1

This commit is contained in:
Antonio Cañas Vargas 2017-10-10 12:40:52 +02:00
parent 03827a85a1
commit 6916ce48b3
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -254,13 +254,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.24 (2017-10-10)"
#define Log_PLATFORM_VERSION "SWAD 17.24.1 (2017-10-10)"
#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.24.1: Oct 10, 2017 Changes in pagination of projects. (234228 lines)
Version 17.24: Oct 10, 2017 Filter projects by department. (234227 lines)
Version 17.23.2: Oct 10, 2017 Code refactoring in filter of projects. (234137 lines)
Version 17.23.1: Oct 10, 2017 Changes in selectors of departments. (234133 lines)

24
swad_project.c
View File

@ -257,12 +257,6 @@ static void Prj_ShowProjectsInCurrentPage (void)
Pag_CalculatePagination (&Pagination);
Gbl.Prjs.CurrentPage = (unsigned) Pagination.CurrentPage;
/***** Write links to pages *****/
if (Pagination.MoreThanOnePage)
Pag_WriteLinksToPagesCentered (Pag_PROJECTS,
0,
&Pagination);
/***** Start box *****/
Box_StartBox ("100%",Txt_Projects,Prj_PutIconsListProjects,
Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE);
@ -284,6 +278,12 @@ static void Prj_ShowProjectsInCurrentPage (void)
if (Gbl.Prjs.Num)
{
/***** Write links to pages *****/
if (Pagination.MoreThanOnePage)
Pag_WriteLinksToPagesCentered (Pag_PROJECTS,
0,
&Pagination);
/***** Allocate memory for the project *****/
Prj_AllocMemProject (&Prj);
@ -309,6 +309,12 @@ static void Prj_ShowProjectsInCurrentPage (void)
/***** Free memory of the project *****/
Prj_FreeMemProject (&Prj);
/***** Write again links to pages *****/
if (Pagination.MoreThanOnePage)
Pag_WriteLinksToPagesCentered (Pag_PROJECTS,
0,
&Pagination);
}
else // No projects created
Ale_ShowAlert (Ale_INFO,Txt_No_projects);
@ -320,12 +326,6 @@ static void Prj_ShowProjectsInCurrentPage (void)
/***** End box *****/
Box_EndBox ();
/***** Write again links to pages *****/
if (Pagination.MoreThanOnePage)
Pag_WriteLinksToPagesCentered (Pag_PROJECTS,
0,
&Pagination);
/***** Free list of projects *****/
Prj_FreeListProjects ();
}