mirror of https://github.com/acanas/swad-core.git
Version 17.20.3
This commit is contained in:
parent
5a3ce1aff3
commit
b062fe6d96
|
@ -256,13 +256,15 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 17.20.2 (2017-10-07)"
|
#define Log_PLATFORM_VERSION "SWAD 17.20.3 (2017-10-07)"
|
||||||
#define CSS_FILE "swad17.0.css"
|
#define CSS_FILE "swad17.0.css"
|
||||||
#define JS_FILE "swad17.17.1.js"
|
#define JS_FILE "swad17.17.1.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 17.20.3: Oct 07, 2017 Changes in layout of project.
|
||||||
|
Fixed bug when hiding/shown a project. (232971 lines)
|
||||||
Version 17.20.2: Oct 07, 2017 Fixed bugs and changes in layout of project file browser. (232960 lines)
|
Version 17.20.2: Oct 07, 2017 Fixed bugs and changes in layout of project file browser. (232960 lines)
|
||||||
Version 17.20.1: Oct 07, 2017 Fixed bug in file browser clipboard. (232938 lines)
|
Version 17.20.1: Oct 07, 2017 Fixed bug in file browser clipboard. (232938 lines)
|
||||||
Version 17.20: Oct 06, 2017 New file browser for project documents. Not finished. (232915 lines)
|
Version 17.20: Oct 06, 2017 New file browser for project documents. Not finished. (232915 lines)
|
||||||
|
|
|
@ -627,13 +627,19 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
|
||||||
/* Forms to remove/edit this project */
|
/* Forms to remove/edit this project */
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td class=\"CONTEXT_COL");
|
"<td class=\"CONTEXT_COL");
|
||||||
if (ProjectView == Prj_LIST_PROJECTS)
|
switch (ProjectView)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out," COLOR%u\">",Gbl.RowEvenOdd);
|
case Prj_LIST_PROJECTS:
|
||||||
Prj_PutFormsToRemEditOnePrj (Prj->PrjCod,Prj->Hidden);
|
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
|
||||||
|
// no break
|
||||||
|
case Prj_FILE_BROWSER_PROJECT:
|
||||||
|
fprintf (Gbl.F.Out,"\">");
|
||||||
|
Prj_PutFormsToRemEditOnePrj (Prj->PrjCod,Prj->Hidden);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf (Gbl.F.Out,"\">");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
fprintf (Gbl.F.Out,"\">");
|
|
||||||
fprintf (Gbl.F.Out,"</td>");
|
fprintf (Gbl.F.Out,"</td>");
|
||||||
|
|
||||||
/* Start date/time */
|
/* Start date/time */
|
||||||
|
@ -1563,7 +1569,7 @@ static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -1646,7 +1652,7 @@ static void Prj_RemUsrFromPrj (Prj_RoleInProject_t RoleInProject)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -2186,7 +2192,7 @@ void Prj_ReqRemProject (void)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -2229,7 +2235,7 @@ void Prj_RemoveProject (void)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -2278,8 +2284,11 @@ void Prj_HideProject (void)
|
||||||
/***** Allocate memory for the project *****/
|
/***** Allocate memory for the project *****/
|
||||||
Prj_AllocMemProject (&Prj);
|
Prj_AllocMemProject (&Prj);
|
||||||
|
|
||||||
/***** Get project code *****/
|
/***** Get parameters *****/
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
Prj_GetParamPrjOrder ();
|
||||||
|
Prj_GetParamWhichPrjs ();
|
||||||
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -2321,8 +2330,11 @@ void Prj_ShowProject (void)
|
||||||
/***** Allocate memory for the project *****/
|
/***** Allocate memory for the project *****/
|
||||||
Prj_AllocMemProject (&Prj);
|
Prj_AllocMemProject (&Prj);
|
||||||
|
|
||||||
/***** Get project code *****/
|
/***** Get parameters *****/
|
||||||
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) == -1L)
|
Prj_GetParamPrjOrder ();
|
||||||
|
Prj_GetParamWhichPrjs ();
|
||||||
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
|
if ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0)
|
||||||
Lay_ShowErrorAndExit ("Code of project is missing.");
|
Lay_ShowErrorAndExit ("Code of project is missing.");
|
||||||
|
|
||||||
/***** Get data of the project from database *****/
|
/***** Get data of the project from database *****/
|
||||||
|
@ -2385,9 +2397,7 @@ static void Prj_RequestCreatOrEditPrj (long PrjCod)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
|
ItsANewProject = ((Prj.PrjCod = PrjCod) < 0);
|
||||||
/***** Get the code of the project *****/
|
|
||||||
ItsANewProject = ((Prj.PrjCod = PrjCod) == -1L);
|
|
||||||
|
|
||||||
/***** Get from the database the data of the project *****/
|
/***** Get from the database the data of the project *****/
|
||||||
if (ItsANewProject)
|
if (ItsANewProject)
|
||||||
|
@ -2696,10 +2706,7 @@ void Prj_RecFormProject (void)
|
||||||
Prj_GetParamPrjOrder ();
|
Prj_GetParamPrjOrder ();
|
||||||
Prj_GetParamWhichPrjs ();
|
Prj_GetParamWhichPrjs ();
|
||||||
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
Gbl.Prjs.CurrentPage = Pag_GetParamPagNum (Pag_PROJECTS);
|
||||||
|
ItsANewProject = ((Prj.PrjCod = Prj_GetParamPrjCod ()) < 0);
|
||||||
/* Get the code of the project */
|
|
||||||
Prj.PrjCod = Prj_GetParamPrjCod ();
|
|
||||||
ItsANewProject = (Prj.PrjCod < 0);
|
|
||||||
|
|
||||||
if (ItsANewProject)
|
if (ItsANewProject)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue