Merge branch 'master' into develop

LimeSurvey · Sep 23, 2021 · 063a4b7 · 063a4b7
2 parents 0b3110a + 57be7e3
commit 063a4b7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php
@@ -454,7 +454,6 @@ function SPSSFieldMap($iSurveyID, $prefix = 'V', $sLanguage = '')
         Question::QT_U_HUGE_FREE_TEXT => array('name' => 'Huge Free Text', 'size' => 1, 'SPSStype' => 'A'),
         Question::QT_I_LANGUAGE => array('name' => 'Language Switch', 'size' => 2, 'SPSStype' => 'A'),
         Question::QT_EXCLAMATION_LIST_DROPDOWN => array('name' => 'List (Dropdown)', 'size' => 1, 'SPSStype' => 'F'),
-        Question::QT_Z_LIST_RADIO_FLEXIBLE => array('name' => 'List (Flexible Labels) (Radio)', 'size' => 1, 'SPSStype' => 'F'),
         Question::QT_L_LIST => array('name' => 'List (Radio)', 'size' => 1, 'SPSStype' => 'F'),
         Question::QT_O_LIST_WITH_COMMENT => array('name' => 'List With Comment', 'size' => 1, 'SPSStype' => 'F'),
         Question::QT_T_LONG_FREE_TEXT => array('name' => 'Long free text', 'size' => 1, 'SPSStype' => 'A'),

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -72,7 +72,6 @@ class Question extends LSActiveRecord
     const QT_U_HUGE_FREE_TEXT = 'U';
     const QT_X_BOILERPLATE_QUESTION = 'X';
     const QT_Y_YES_NO_RADIO = 'Y';
-    const QT_Z_LIST_RADIO_FLEXIBLE = 'Z';
     const QT_EXCLAMATION_LIST_DROPDOWN = '!';
     const QT_VERTICAL_FILE_UPLOAD = '|';
     const QT_ASTERISK_EQUATION = '*';
@@ -628,8 +627,6 @@ public static function getQuestionClass($sType)
                 return 'boilerplate';
             case Question::QT_Y_YES_NO_RADIO:
                 return 'yes-no';
-            case Question::QT_Z_LIST_RADIO_FLEXIBLE:
-                return 'list-radio-flexible';
             case Question::QT_EXCLAMATION_LIST_DROPDOWN:
                 return 'list-dropdown';
             case Question::QT_COLON_ARRAY_MULTI_FLEX_NUMBERS:

diff --git a/application/models/QuestionType.php b/application/models/QuestionType.php
@@ -40,7 +40,6 @@ class QuestionType extends StaticModel
     const QT_U_HUGE_FREE_TEXT = 'U';
     const QT_X_BOILERPLATE_QUESTION = 'X';
     const QT_Y_YES_NO_RADIO = 'Y';
-    const QT_Z_LIST_RADIO_FLEXIBLE = 'Z';
     const QT_EXCLAMATION_LIST_DROPDOWN = '!';
     const QT_VERTICAL_FILE_UPLOAD = '|';
     const QT_ASTERISK_EQUATION = '*';