Dev: Fixed survey saving options

LimeSurvey · Mar 13, 2018 · 8382937 · 8382937
1 parent 11af680
commit 8382937
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -5415,9 +5415,9 @@ private function _UpdateValuesInDatabase($finished=false)
 
                 $sdata = array_filter($sdata);
                 SurveyDynamic::sid($this->sid);
-                $oSurvey = new SurveyDynamic;
+                $oSurveyDynamic = new SurveyDynamic;
 
-                $iNewID = $oSurvey->insertRecords($sdata);
+                $iNewID = $oSurveyDynamic->insertRecords($sdata);
                 if ($iNewID)    // Checked
                 {
                     $srid = $iNewID;
@@ -5510,15 +5510,15 @@ private function _UpdateValuesInDatabase($finished=false)
                 if (isset($_SESSION[$this->sessid]['srid']) && $this->surveyOptions['active'])
                 {
                     $oSurveyResponse = SurveyDynamic::model($this->sid)->findByAttributes(['id' => $_SESSION[$this->sessid]['srid']]);
-
+                    $oSurvey = Survey::model()->findByPk($this->sid);
                     //If the responses already have been submitted once they are marked as completed already, so they shouldn't be changed.
-                    if($oSurveyResponse->lastpage != 1){
+                    if($oSurveyResponse->submitdate == null || $oSurvey->alloweditaftercompletion == 'Y'){
                         array_walk($setter, function($value, $key) use (&$oSurveyResponse) {
                             $oSurveyResponse->setAttribute($key, $value);
                         });
+                        $saveResult = $oSurveyResponse->save();
                     }
 
-                    $saveResult = $oSurveyResponse->save();
 
                     if ( !$saveResult || $oSurveyResponse == null)
                     {