Fixed issue #06451: Missing array filter edit boxes in Ranking Question

Dev confirmed works with IE, Chrome, and Mozilla
LimeSurvey · Aug 14, 2012 · 3dfb41f · 3dfb41f
1 parent 306c432
commit 3dfb41f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -3218,23 +3218,23 @@ function questionAttributes($returnByName=false)
     "caption"=>$clang->gT('Repeat headers'));
 
     $qattributes["array_filter"]=array(
-    "types"=>"1ABCEF:;MPLKQ",
+    "types"=>"1ABCEF:;MPLKQR",
     'category'=>$clang->gT('Logic'),
     'sortorder'=>100,
     'inputtype'=>'text',
     "help"=>$clang->gT("Enter the code(s) of Multiple choice question(s) (separated by semicolons) to only show the matching answer options in this question."),
     "caption"=>$clang->gT('Array filter'));
 
     $qattributes["array_filter_exclude"]=array(
-    "types"=>"1ABCEF:;MPLKQ",
+    "types"=>"1ABCEF:;MPLKQR",
     'category'=>$clang->gT('Logic'),
     'sortorder'=>100,
     'inputtype'=>'text',
     "help"=>$clang->gT("Enter the code(s) of Multiple choice question(s) (separated by semicolons) to exclude the matching answer options in this question."),
     "caption"=>$clang->gT('Array filter exclusion'));
 
     $qattributes["array_filter_style"]=array(
-    "types"=>"1ABCEF:;MPLKQ",
+    "types"=>"1ABCEF:;MPLKQR",
     'category'=>$clang->gT('Logic'),
     'sortorder'=>100,
     'inputtype'=>'singleselect',

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -1113,7 +1113,7 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                                 case 'P': //Multiple choice with comments checkbox + text
                                 case 'K': //MULTIPLE NUMERICAL QUESTION
                                 case 'Q': //MULTIPLE SHORT TEXT
-//                                case 'R': //Ranking
+                                case 'R': //Ranking
 //                                    if ($this->sgqaNaming)
 //                                    {
                                         foreach ($cascadedAF as $_caf)

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -2162,7 +2162,7 @@ function do_ranking($ia)
     $answer .="</ul>"
         . "<div style='display:none' id='ranking-{$ia[0]}-maxans'>{".$max_answers."}</div>"
         . "<div style='display:none' id='ranking-{$ia[0]}-minans'>{".$min_answers."}</div>"
-        . "<div style='display:none' id='ranking-{$ia[0]}-name'>javatb".$myfname."</div>"
+        . "<div style='display:none' id='ranking-{$ia[0]}-name'>javatbd".$ia[1]."</div>"
         . "</div>";
     // The list with HTML answres
     $answer .="<div style=\"display:none\">";