Fixed issue: Return from Quota resets survey completely.

LimeSurvey · Jul 30, 2018 · f539e5c · LouisGac · Jul 30, 2018 · Shnoulle
1 parent 6188c52
commit f539e5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -752,7 +752,11 @@ private function checkQuotas()
         /* quota submitted */
         if ($this->sMove == 'confirmquota') {
             checkCompletedQuota($this->iSurveyid);
-        }
+        } 
+        /* quota submitted */
+        if ($this->sMove == 'returnfromquota') {
+            LimeExpressionManager::JumpTo($this->param->thisstep);
+        } 
     }
 
     /**

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -1884,8 +1884,8 @@ function checkCompletedQuota($surveyid, $return = false)
     $thissurvey['aQuotas']                       = array();
     $thissurvey['aQuotas']['sMessage']           = $sMessage;
     $thissurvey['aQuotas']['bShowNavigator']     = !$closeSurvey;
-    $thissurvey['aQuotas']['sQuotaStep']         = isset($_SESSION['survey_'.$surveyid]['step']) ? $_SESSION['survey_'.$surveyid]['step'] : 0; // Surely not needed
     $thissurvey['aQuotas']['sClientToken']       = $sClientToken;
+    $thissurvey['aQuotas']['sQuotaStep']         = 'returnfromquota';
     $thissurvey['aQuotas']['aPostedQuotaFields'] = isset($aPostedQuotaFields) ? $aPostedQuotaFields : '';
     $thissurvey['aQuotas']['sPluginBlocks']      = implode("\n", $blocks);
     $thissurvey['aQuotas']['sUrlDescription']    = $sUrlDescription;
@@ -1894,8 +1894,8 @@ function checkCompletedQuota($surveyid, $return = false)
 
 
     $thissurvey['aQuotas']['hiddeninputs'] = '<input type="hidden" name="sid"      value="'.$surveyid.'" />
-                                                   <input type="hidden" name="token"    value="'.$thissurvey['aQuotas']['sClientToken'].'" />
-                                                   <input type="hidden" name="thisstep" value="'.$thissurvey['aQuotas']['sQuotaStep'].'" />';
+                                              <input type="hidden" name="token"    value="'.$thissurvey['aQuotas']['sClientToken'].'" />
+                                              <input type="hidden" name="thisstep" value="'.(isset($_SESSION['survey_'.$surveyid]['step']) ? $_SESSION['survey_'.$surveyid]['step'] : 0).'" />';
 
 
     if (!empty($thissurvey['aQuotas']['aPostedQuotaFields'])){

diff --git a/themes/survey/vanilla/views/subviews/content/quotas.twig b/themes/survey/vanilla/views/subviews/content/quotas.twig
@@ -89,7 +89,7 @@
                                 </div>
                             </div>
 
-                            {{ aSurveyInfo.hiddeninputs }}
+                            {{ aSurveyInfo.aQuotas.hiddeninputs }}
 
                         </form>
                 {% endif %}