Fixed issue #9574: Conditions page is huge and slow when rendering co…

…ndition options for Array (Number) questions
LimeSurvey · Jun 14, 2016 · 2f5bd30 · 2f5bd30
1 parent 7dc3e38
commit 2f5bd30
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -826,13 +826,9 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
                         {
                             $shortquestion=$rows['title'].":{$yrow['title']}:$key: [".strip_tags($yrow['question']). "][" .strip_tags($val). "] " . flattenText($rows['question']);
                             $cquestions[]=array($shortquestion, $rows['qid'], $rows['type'], $rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$yrow['title']."_".$key);
-
-                            if ($rows['type'] == ":")
+                            if ($rows['mandatory'] != 'Y')
                             {
-                                for($ii=$minvalue; $ii<=$maxvalue; $ii+=$stepvalue)
-                                {
-                                    $canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$yrow['title']."_".$key, $ii, $ii);
-                                }
+                                $canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$yrow['title']."_".$key, "", gT("No answer"));
                             }
                         }
                     }
@@ -1106,9 +1102,9 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
             foreach($canswers as $can)
             {
                 $an = ls_json_encode(flattenText($can[2]));
-                $javascriptpre .= "Fieldnames[$jn]='$can[0]';\n"
-                . "Codes[$jn]='$can[1]';\n"
-                . "Answers[$jn]={$an};\n";
+                $javascriptpre .= "Fieldnames[{$jn}]='{$can[0]}';\n"
+                . "Codes[{$jn}]='{$can[1]}';\n"
+                . "Answers[{$jn}]={$an};\n";
                 $jn++;
             }
         }