Fixed issue #16519: For specific screen navigation, condition is not …

…saved properly Resetting cqid when using token fields
LimeSurvey · Jul 31, 2020 · 492a855 · 492a855
1 parent cdc1ddf
commit 492a855
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -685,6 +685,7 @@ protected function insertCondition(array $args)
             $conditionCfieldname = $p_cquestions;
         } elseif (isset($p_csrctoken) && $p_csrctoken != '') {
             $conditionCfieldname = $p_csrctoken;
+            $p_cqid = 0;  // Reset cqid if condition is based on token attribute
         }
 
         $condition_data = array(

diff --git a/assets/scripts/admin/conditions.js b/assets/scripts/admin/conditions.js
@@ -130,10 +130,6 @@ $(document).on('ready  pjax:scriptcomplete', function(){
     p2.methodId          = '#quick-add-method';
     p2.canswersToSelectId= '#quick-add-canswersToSelectId';
 	$('#quick-add-cquestions').change(p2.fun);
-
-	$('#csrctoken').change(function() {
-		$('#cqid').val(0);
-	});
 
 	// At editing, if cquestions is set, populate answers
 	if ($('#cquestions').val() != '') {