From 6ee0ba9c1dd71bdcf221c22974405318998a8f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 9 Sep 2016 01:17:53 +0200 Subject: [PATCH] Version 15.250.1 --- swad_changelog.h | 3 ++- swad_country.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 168172ba..ce6053f2 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -135,13 +135,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.250 (2016-09-09)" +#define Log_PLATFORM_VERSION "SWAD 15.250.1 (2016-09-09)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.238.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 15.250.1: Sep 09, 2016 Changes in layout of user's usage report. (204056 lines) Version 15.250: Sep 09, 2016 New option to print user's usage report. (204053 lines) Version 15.249.5: Sep 08, 2016 Changes in layout of user's usage report. (204019 lines) Version 15.249.4: Sep 08, 2016 List of courses in user's usage report. (203993 lines) diff --git a/swad_country.c b/swad_country.c index a13e9fe0..d1b61cbd 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1125,14 +1125,13 @@ void Cty_WriteCountryName (long CtyCod,const char *Class) extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS]; char CtyName[Cty_MAX_BYTES_COUNTRY_NAME+1]; char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1]; + bool PutForm = !Gbl.Form.Inside && // Only if not inside another form + Act_Actions[Gbl.Action.Act].BrowserWindow == Act_MAIN_WINDOW; // Only in main window /***** Get country name *****/ Cty_GetCountryName (CtyCod,CtyName); - if (Gbl.Form.Inside) // If we are writing another form - /***** Write country name without link *****/ - fprintf (Gbl.F.Out,"%s",CtyName); - else + if (PutForm) { /***** Write country name with link to country information *****/ Act_FormStart (ActSeeCtyInf); @@ -1142,6 +1141,9 @@ void Cty_WriteCountryName (long CtyCod,const char *Class) fprintf (Gbl.F.Out,"%s",CtyName); Act_FormEnd (); } + else + /***** Write country name without link *****/ + fprintf (Gbl.F.Out,"%s",CtyName); } /*****************************************************************************/