From 08b430904bdb51cdeb2a428a96aa991dcd3e4ca1 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Fri, 13 Oct 2017 15:59:35 +0200
Subject: [PATCH] Dev: Include surveyid in some more quickmenu links

---
 application/config/version.php                 |  2 +-
 application/helpers/update/updatedb_helper.php | 10 ++++++++++
 installer/php/create-database.php              |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/application/config/version.php b/application/config/version.php
index 4f48a27d9aa..d304b94b0bd 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -14,7 +14,7 @@
 
 $config['versionnumber'] = '3.0.0-beta.3'; //The current version of this branch
 $config['masterversion'] = '2.67.3'; //The current masters version merged into this branch
-$config['dbversionnumber'] = 320;
+$config['dbversionnumber'] = 321;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '2903';
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
index c2a2c1bc5fd..52c9c087602 100644
--- a/application/helpers/update/updatedb_helper.php
+++ b/application/helpers/update/updatedb_helper.php
@@ -501,6 +501,16 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
         $oTransaction->commit();
     }
 
+    if ($iOldDBVersion < 321) {
+        $oTransaction = $oDB->beginTransaction();
+        $oDB->createCommand()->update(
+            '{{surveymenu_entries}}',
+            array('data' => '{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}'),
+            "name = 'statistics' OR name = 'responses'"
+        );
+        $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>321),"stg_name='DBVersion'");
+        $oTransaction->commit();
+    }
 
     }
     catch(Exception $e)
diff --git a/installer/php/create-database.php b/installer/php/create-database.php
index 6e980d09661..fd0018732bb 100644
--- a/installer/php/create-database.php
+++ b/installer/php/create-database.php
@@ -5,7 +5,7 @@ function createDatabase($oDB){
     */
     
     ////// Current database version: //////
-    $databaseCurrentVersion = "320";
+    $databaseCurrentVersion = "321";
     ///////////////////////////////////////
     
     Yii::app()->loadHelper('database');
@@ -511,8 +511,8 @@ function createDatabase($oDB){
         [2,NULL,11,'surveyLogicFile','Survey logic file','Survey logic file','Survey logic file','sitemap','fontawesome','','admin/expressions/sa/survey_logic_file/','','','','','surveycontent','read','{\"render\": { \"link\": {\"data\": {\"surveyid\": [\"survey\",\"sid\"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
         [2,NULL,12,'tokens','Token handling','Participant tokens','Define how tokens should be treated or generated','user','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_tokens_panel','','surveylocale','read','{\"render\": { \"link\": {\"data\": {\"surveyid\": [\"survey\",\"sid\"]}}}}','_tabTokens','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
         [2,NULL,13,'cpdb','Central participant database','Central participant database','Central participant database','users','fontawesome','','admin/participants/sa/displayParticipants','','','','','tokens','read','{render\: {\"link\"\: {}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
-        [2,NULL,14,'responses','Responses','Responses','Responses','icon-browse','iconclass','','admin/responses/sa/browse/','','','','','responses','read','{\"render\"\: {\"isActive\"\: true}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
-        [2,NULL,15,'statistics','Statistics','Statistics','Statistics','bar-chart','fontawesome','','admin/statistics/sa/index/','','','','','statistics','read','{\"render\"\: {\"isActive\"\: true}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
+        [2,NULL,14,'responses','Responses','Responses','Responses','icon-browse','iconclass','','admin/responses/sa/browse/','','','','','responses','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
+        [2,NULL,15,'statistics','Statistics','Statistics','Statistics','bar-chart','fontawesome','','admin/statistics/sa/index/','','','','','statistics','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
         [2,NULL,16,'reorder','Reorder questions/question groups','Reorder questions/question groups','Reorder questions/question groups','icon-organize','iconclass','','admin/survey/sa/organize/','','','','','surveycontent','update','{\"render\": {\"isActive\": false, \"link\": {\"data\": {\"surveyid\": [\"survey\",\"sid\"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
         ];