diff --git a/sql/cambios.sql b/sql/cambios.sql index 69d08e7e7..5b729d7f2 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -12911,7 +12911,7 @@ SELECT gam_questions.QstCod, -swad 18.129.1 ----> swad 19.25 +swad 18.128 ----> swad 19.25 Ficheros: --------- @@ -12928,6 +12928,9 @@ sudo cp -a fontawesome /var/www/html/swad/ Base de datos: -------------- +UPDATE actions SET Txt='Solicitar la creación de una cuenta (1/2)' WHERE ActCod='36' AND Language='es'; +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1787','es','N','Solicitar la creación de una cuenta (2/2)'); + ALTER TABLE games DROP COLUMN StartTime,DROP COLUMN EndTime; UPDATE actions SET Obsolete='Y' WHERE ActCod=1779; @@ -12996,7 +12999,6 @@ RENAME TABLE gam_players TO mch_players; RENAME TABLE gam_mch_being_played TO mch_playing; RENAME TABLE gam_time TO mch_times; RENAME TABLE games TO gam_games; -DROP TABLE gam_playing; ALTER TABLE mch_matches DROP COLUMN Showing; ALTER TABLE mch_matches ADD COLUMN Showing ENUM('nothing','stem','answers','results') NOT NULL DEFAULT 'nothing' AFTER ShowResults; diff --git a/swad_changelog.h b/swad_changelog.h index 221d6ce75..9af7fc6cf 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -474,10 +474,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.25.2 (2019-09-30)" +#define Log_PLATFORM_VERSION "SWAD 19.25.3 (2019-09-30)" #define CSS_FILE "swad19.15.css" #define JS_FILE "swad19.15.js" /* + Version 19.25.3: Sep 30, 2019 Fixed bug: students should not see icon to add a match. (246745 lines) Version 19.25.2: Sep 30, 2019 Fixed bug in match results. (246744 lines) Version 19.25.1: Sep 30, 2019 Fixed bug in match results. (246743 lines) Version 19.25: Sep 30, 2019 Code refactoring in match results. (246743 lines) @@ -636,7 +637,7 @@ ALTER TABLE mch_matches ADD COLUMN Showing ENUM('nothing','stem','answers','resu Version 19.4.2: Sep 17, 2019 Fixed bug when removing a question in a game. (244654 lines) Version 19.4.1: Sep 17, 2019 Fixed bug when removing a question in a game. (244650 lines) Version 19.4: Sep 17, 2019 Changes in games ans matches tables. (244644 lines) - 8 changes necessary in database: + 7 changes necessary in database: RENAME TABLE gam_answers TO mch_answers; RENAME TABLE gam_grp TO mch_groups; RENAME TABLE gam_matches TO mch_matches; @@ -644,7 +645,6 @@ RENAME TABLE gam_players TO mch_players; RENAME TABLE gam_mch_being_played TO mch_playing; RENAME TABLE gam_time TO mch_times; RENAME TABLE games TO gam_games; -DROP TABLE gam_playing; Version 19.3: Sep 15, 2019 Changes in match results. (244680 lines) 2 changes necessary in database: diff --git a/swad_match.c b/swad_match.c index fd9c8a7fe..e45c2724d 100644 --- a/swad_match.c +++ b/swad_match.c @@ -87,7 +87,7 @@ long Mch_CurrentMchCod = -1L; // Used as parameter in contextual links /***************************** Private prototypes ****************************/ /*****************************************************************************/ -static void Mch_PutIconToPlayNewMatch (void); +static void Mch_PutIconToCreateNewMatch (void); static void Mch_ListOneOrMoreMatches (struct Game *Game, unsigned NumMatches, @@ -198,6 +198,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch) char *SubQuery; MYSQL_RES *mysql_res; unsigned NumMatches; + bool ICanEditMatches = Mch_CheckIfICanEditMatches (); /***** Get data of matches from database *****/ /* Fill subquery for game */ @@ -243,7 +244,8 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch) /***** Start box *****/ Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter - Box_StartBox (NULL,Txt_Matches,Mch_PutIconToPlayNewMatch, + Box_StartBox (NULL,Txt_Matches,ICanEditMatches ? Mch_PutIconToCreateNewMatch : + NULL, Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -342,7 +344,7 @@ void Mch_GetDataOfMatchByCod (struct Match *Match) /********************* Put icon to create a new match ************************/ /*****************************************************************************/ -static void Mch_PutIconToPlayNewMatch (void) +static void Mch_PutIconToCreateNewMatch (void) { extern const char *Txt_New_match; @@ -483,7 +485,6 @@ static bool Mch_CheckIfICanEditMatches (void) default: return false; } - return false; } /*****************************************************************************/