From b21b1da396cd3db7c0801c276fe649c8a2587571 Mon Sep 17 00:00:00 2001 From: Dominik Vitt Date: Wed, 7 Nov 2018 13:23:27 +0100 Subject: [PATCH 1/7] Fixed issue: Condition designer doesn't show predefined answers on first load --- application/views/admin/conditions/conditionshead_view.php | 2 +- assets/scripts/admin/conditions.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php index 8fede02f729..8b75f265a75 100644 --- a/application/views/admin/conditions/conditionshead_view.php +++ b/application/views/admin/conditions/conditionshead_view.php @@ -53,7 +53,7 @@ class='btn btn-default pull-right condition-header-button' getClientScript()->registerScript("conditionshead_prepared_javascript", $javascriptpre, LSYii_ClientScript::POS_BEGIN);?> -getClientScript()->registerScript("conditionshead_onrun_javascript", 'doToolTip();', LSYii_ClientScript::POS_POSTSCRIPT);?> +getClientScript()->registerScript("conditionshead_onrun_javascript", 'window.LS.doToolTip();', LSYii_ClientScript::POS_POSTSCRIPT);?> - \ No newline at end of file + From 9328d6c7bfad9e8bf158a63ae0fdee05fd9bd1f0 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 8 Nov 2018 08:57:02 +0100 Subject: [PATCH 5/7] Fixed issue: Update not possible from pre 3.x versions --- application/helpers/update/updatedb_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php index e37b8f3d598..b6e224e8a5e 100644 --- a/application/helpers/update/updatedb_helper.php +++ b/application/helpers/update/updatedb_helper.php @@ -2285,8 +2285,9 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false) $aIdMap = []; $aDefaultSurveyMenus = LsDefaultDataSets::getSurveyMenuData(); - foreach($aDefaultSurveyMenus as $i => $aSurveymenu) { + foreach ($aDefaultSurveyMenus as $i => $aSurveymenu) { $oDB->createCommand()->delete('{{surveymenu}}', 'name=:name', [':name' => $aSurveymenu['name']]); + $oDB->createCommand()->delete('{{surveymenu}}', 'id=:id', [':id' => $aSurveymenu['id']]); $oDB->createCommand()->insert('{{surveymenu}}', $aSurveymenu); $aIdMap[$aSurveymenu['name']] = $oDB->getCommandBuilder()->getLastInsertID('{{surveymenu}}'); } From eef95138590c7d0a2ebb5fb169ce9eb53a92e29f Mon Sep 17 00:00:00 2001 From: LouisGac Date: Thu, 8 Nov 2018 12:32:36 +0100 Subject: [PATCH 6/7] Release 3.15.3+181108 --- application/config/version.php | 4 ++-- docs/release_notes.txt | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/application/config/version.php b/application/config/version.php index c54ec138be9..4b1815601a3 100644 --- a/application/config/version.php +++ b/application/config/version.php @@ -12,9 +12,9 @@ */ -$config['versionnumber'] = '3.15.2'; +$config['versionnumber'] = '3.15.3'; $config['dbversionnumber'] = 355; $config['buildnumber'] = ''; $config['updatable'] = true; -$config['assetsversionnumber'] = '30065'; +$config['assetsversionnumber'] = '30066'; return $config; diff --git a/docs/release_notes.txt b/docs/release_notes.txt index 4c1eb509262..de5f4b9cf52 100644 --- a/docs/release_notes.txt +++ b/docs/release_notes.txt @@ -35,6 +35,23 @@ Thank you to everyone who helped with this new release! CHANGE LOG ------------------------------------------------------ + +Changes from 3.15.2 (build 181107) to 3.15.3 (build 181018) November 08, 2018 +-Fixed issue #11845: Relevance Equation code is missing syntax highlighting and not recognising question variables (Dominik Vitt) +-Fixed issue #14211 : no keyboard navigation available with language changer (Denis Chenu) +-Fixed issue: Condition designer doesn't show predefined answers on first load (Dominik Vitt) +-Fixed issue: Selected survey language for browsing responses was not used in detail view or queXML PDF view (Carsten Schmitz) +-Fixed issue: Update not possible from pre 3.x versions (Carsten Schmitz) +#Updated translation: German (Informal) by c_schmitz +#Updated translation: German by c_schmitz +#Updated translation: Italian (Informal) by lfanfoni +#Updated translation: Italian by lfanfoni +#Updated translation: Japanese by nomoto +#Updated translation: Norwegian (Bokmål) by pmonstad +#Updated translation: Papiamento (Curaçao and Bonaire) by c_schmitz +#Updated translation: Romanian by cdorin + + Changes from 3.15.1 (build 181017) to 3.15.2 (build 181107) November 07, 2018 -New feature: allow to change config file location (LouisGac) From 26dba200d1aa42ca28b2f4313c473680930bb993 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 8 Nov 2018 13:00:48 +0100 Subject: [PATCH 7/7] Fixed issue: HTML quotes not properly decoded in VV export file header --- application/controllers/admin/export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php index 52617e28ef1..559618c0073 100644 --- a/application/controllers/admin/export.php +++ b/application/controllers/admin/export.php @@ -642,7 +642,7 @@ public function vvexport() if (count($fielddata) < 1) { $firstline .= $field; } else { - $firstline .= preg_replace('/\s+/', ' ', strip_tags($fielddata['question'])); + $firstline .= preg_replace('/\s+/', ' ', flattenText($fielddata['question'],false,true,'UTF-8',true)); } $firstline .= $s; if ($vvVersion == 2) {