From 88c7fa839a220b0d3495b5d1cd4829c390e384e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 28 Apr 2017 13:38:23 +0200 Subject: [PATCH] Version 16.194.16 --- swad_changelog.h | 3 ++- swad_survey.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index c7668c28e..74e85f1d0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,13 +221,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.194.15 (2017-04-28)" +#define Log_PLATFORM_VERSION "SWAD 16.194.16 (2017-04-28)" #define CSS_FILE "swad16.193.4.css" #define JS_FILE "swad16.181.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 16.194.16:Apr 28, 2017 Changed dialog to remove a survey question. (218370 lines) Version 16.194.15:Apr 28, 2017 Changed dialog to remove another user's photo. Fixed bug when uploading photo. (218370 lines) Version 16.194.14:Apr 28, 2017 Changed dialog to remove a group. (218368 lines) diff --git a/swad_survey.c b/swad_survey.c index c69094d4c..4d82cd786 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -2648,7 +2648,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, if (SvyQst->QstCod > 0) // If the question already has assigned a code { /* Parameters for contextual icon */ - Gbl.Svys.SvyCodToEdit = SvyCod; + Gbl.Svys.SvyCodToEdit = SvyCod; Gbl.Svys.SvyQstCodToEdit = SvyQst->QstCod; sprintf (Gbl.Title,"%s %u", @@ -3535,19 +3535,17 @@ void Svy_RequestRemoveQst (void) /* Get question index */ SvyQst.QstInd = Svy_GetQstIndFromQstCod (SvyQst.QstCod); - /***** Start form *****/ - Act_FormStart (ActRemSvyQst); - Svy_PutParamSvyCod (SvyCod); - Svy_PutParamQstCod (SvyQst.QstCod); - - /***** Ask for confirmation of removing *****/ + /***** Show question and button to remove question *****/ + /* Start alert */ sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_question_X, (unsigned long) (SvyQst.QstInd + 1)); - Lay_ShowAlert (Lay_WARNING,Gbl.Message); - Lay_PutRemoveButton (Txt_Remove_question); + Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message); - /***** End form *****/ - Act_FormEnd (); + /* End alert */ + Gbl.Svys.SvyCodToEdit = SvyCod; + Gbl.Svys.SvyQstCodToEdit = SvyQst.QstCod; + Lay_ShowAlertAndButton2 (ActRemSvyQst,NULL,Svy_PutParamsRemoveOneQst, + Lay_REMOVE_BUTTON,Txt_Remove_question); /***** Show current survey *****/ Svy_ShowOneSurvey (SvyCod,&SvyQst,true);