Merge branch 'task/zoho-L41-T393-hide-question' into task/zoho-L41-T3…

…88-check-all-switches-for-int-in-db
LimeSurvey · Feb 22, 2021 · 5130316 · 5130316
2 parents 622eee8 + 7492866
commit 5130316
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  */
 
 $config['versionnumber'] = '4.4.9';
-$config['dbversionnumber'] = 437;
+$config['dbversionnumber'] = 438;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;

diff --git a/application/controllers/QuestionAdministrationController.php b/application/controllers/QuestionAdministrationController.php
@@ -2543,7 +2543,13 @@ private function unparseAndSetGeneralOptions($oQuestion, $dataSet)
      * @todo document me
      *
      * @param Question $oQuestion
-     * @param array $dataSet
+     * @param array $dataSet these are the advancedSettings in an array like
+     *                       [display]
+     *                         [hidden]
+     *                         ...
+     *                       [logic]
+     *                       ...
+     *
      * @return boolean
      * @throws CHttpException
      */

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -3622,6 +3622,15 @@ function ($v) {
             $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 437), "stg_name='DBVersion'");
             $oTransaction->commit();
         }
+        if($iOldDBVersion < 438){
+            $oTransaction = $oDB->beginTransaction();
+
+            $oDB->createCommand()->update('{{question_attributes}}', array('value' => '1'), "attribute = 'hidden' and value = 'Y'");
+            $oDB->createCommand()->update('{{question_attributes}}', array('value' => '0'), "attribute = 'hidden' and value = 'N'");
+
+            $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 438), "stg_name='DBVersion'");
+            $oTransaction->commit();
+        }
     } catch (Exception $e) {
         Yii::app()->setConfig('Updating', false);
         $oTransaction->rollback();