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

Version 15.199.4

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-04-17 23:20:47 +02:00
parent 455fa0f7bf
commit 715dbf0c6a
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swad_centre.c
View File

@ -2695,7 +2695,6 @@ unsigned Ctr_GetNumCtrsWithUsrs (Rol_Role_t Role,const char *SubQuery)
unsigned Ctr_ListCtrsFound (const char *Query) unsigned Ctr_ListCtrsFound (const char *Query)
{ {
extern const char *Txt_Centres;
extern const char *Txt_centre; extern const char *Txt_centre;
extern const char *Txt_centres; extern const char *Txt_centres;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -2708,18 +2707,11 @@ unsigned Ctr_ListCtrsFound (const char *Query)
if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres"))) if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres")))
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Centres);
/* Number of centres found */ /* Number of centres found */
fprintf (Gbl.F.Out,"<tr>" sprintf (Gbl.Title,"%u %s",
"<th colspan=\"8\" class=\"CENTER_MIDDLE\">"); NumCtrs,(NumCtrs == 1) ? Txt_centre :
if (NumCtrs == 1) Txt_centres);
fprintf (Gbl.F.Out,"1 %s",Txt_centre); Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
else
fprintf (Gbl.F.Out,"%u %s",NumCtrs,Txt_centres);
fprintf (Gbl.F.Out,"</th>"
"</tr>");
Ctr_PutHeadCentresForSeeing (false); // Order not selectable Ctr_PutHeadCentresForSeeing (false); // Order not selectable
/***** List the centres (one row per centre) *****/ /***** List the centres (one row per centre) *****/

3
swad_changelog.h
View File

@ -135,13 +135,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.199.3 (2016-04-17)" #define Log_PLATFORM_VERSION "SWAD 15.199.4 (2016-04-17)"
#define CSS_FILE "swad15.198.css" #define CSS_FILE "swad15.198.css"
#define JS_FILE "swad15.197.js" #define JS_FILE "swad15.197.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 15.199.4: Apr 17, 2016 Changes in title of results of searching centres. (199657 lines)
Version 15.199.3: Apr 17, 2016 Changes in title of results of searching institutions. (199663 lines) Version 15.199.3: Apr 17, 2016 Changes in title of results of searching institutions. (199663 lines)
Version 15.199.2: Apr 16, 2016 Fixed bug in social comments, reported by Javier Fernández Baldomero. (199666 lines) Version 15.199.2: Apr 16, 2016 Fixed bug in social comments, reported by Javier Fernández Baldomero. (199666 lines)
Version 15.199.1: Apr 16, 2016 Fixed bug in Statistics > Degrees. (199665 lines) Version 15.199.1: Apr 16, 2016 Fixed bug in Statistics > Degrees. (199665 lines)

3
swad_institution.c
View File

@ -2248,7 +2248,6 @@ unsigned Ins_GetNumInssWithUsrs (Rol_Role_t Role,const char *SubQuery)
unsigned Ins_ListInssFound (const char *Query) unsigned Ins_ListInssFound (const char *Query)
{ {
extern const char *Txt_Institutions;
extern const char *Txt_institution; extern const char *Txt_institution;
extern const char *Txt_institutions; extern const char *Txt_institutions;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -2265,9 +2264,7 @@ unsigned Ins_ListInssFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumInss,NumInss == 1 ? Txt_institution : NumInss,NumInss == 1 ? Txt_institution :
Txt_institutions); Txt_institutions);
Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
Ins_PutHeadInstitutionsForSeeing (false); // Order not selectable Ins_PutHeadInstitutionsForSeeing (false); // Order not selectable
/***** List the institutions (one row per centre) *****/ /***** List the institutions (one row per centre) *****/