Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Aug 26, 2016 · 1f1caae · 1f1caae
2 parents 1579a03 + 3748d29
commit 1f1caae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -54,8 +54,8 @@
 
     'modules'=>array(
             'gii'=>array(
-                'class'=>'system.gii.GiiModule',
-                'password'=>'toto',
+                //'class'=>'system.gii.GiiModule',
+                //'password'=>'toto',
                 // 'ipFilters'=>array(...a list of IPs...),
                 // 'newFileMode'=>0666,
                 // 'newDirMode'=>0777,

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -7567,10 +7567,9 @@ static function GetRelevanceAndTailoringJavaScript()
                     {
                         $sQid = str_replace("relChange","",$qrelQID);
                         if(!in_array($sQid, $aQuestionsWithDependencies)  )
-                        {                            
+                        {
                             $aQuestionsWithDependencies[]=$sQid;
                         }
-
                     }
 
 

diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js
@@ -144,7 +144,7 @@ function checkconditions(value, name, type, evt_type)
         $('#java'+name).val(value);
     }
 
-    aFieldWithDependencies = $('#aQuestionsWithDependencies').data('qids');
+    aQuestionsWithDependencies = $('#aQuestionsWithDependencies').data('qids');
 
     var result;
     if(typeof name !== 'undefined')
@@ -153,8 +153,8 @@ function checkconditions(value, name, type, evt_type)
         result = result[2]
     }
 
-    $isRelevant = $.inArray(result, aFieldWithDependencies);
-
+    // $isRelevant = $.inArray(result, aQuestionsWithDependencies); NEED TO ADD THE QUESTIONS WITH CONDITIONS BEFORE WE CAN USE IT !!!!
+    $isRelevant = 1;
     if($.isFunction(window.ExprMgr_process_relevance_and_tailoring ) && $isRelevant!=-1)
         ExprMgr_process_relevance_and_tailoring(evt_type,name,type);
 }