Fixed #7101: Error URL doesn't work when submitting a survey via data…

… entry screen dev: some more path fixes
LimeSurvey · Jan 3, 2013 · 040f7c5 · 040f7c5
1 parent 117c875
commit 040f7c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -1601,8 +1601,9 @@ public function insert()
                     {
                         $errormsg .= "<br /><br />".$clang->gT("Follow the following link to update it").":\n";
                         $errormsg .= CHtml::link("[id:$lastanswfortoken]",
-                        Yii::app()->baseUrl.('/admin/dataentry/editdata/subaction/edit/id/'.$lastanswfortoken.'/surveyid/'.$surveyid.'/lang/'.$rlanguage),
+                        $this->getController()->createUrl('/admin/dataentry/sa/editdata/subaction/edit/id/'.$lastanswfortoken.'/surveyid/'.$surveyid.'/lang/'.$rlanguage),
                         array('title' => $clang->gT("Edit this entry")));
+                        $errormsg .= "<br/><br/>";
                     }
                     else
                     {
@@ -1779,7 +1780,7 @@ public function insert()
                         $utresult = dbExecuteAssoc($utquery); //Yii::app()->db->Execute($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n".Yii::app()->db->ErrorMsg());
 
                         // save submitdate into survey table
-                        $sdquery = "UPDATE {{survey_$surveyid}} SET submitdate='".$submitdate."' WHERE id={$new_response}\n";
+                        $sdquery = "UPDATE {{survey_$surveyid}} SET submitdate='".$submitdate."' WHERE id={$last_db_id}\n";
                         $sdresult = dbExecuteAssoc($sdquery) or safeDie ("Couldn't set submitdate response in survey table!<br />\n$sdquery<br />\n");
                         $last_db_id = getLastInsertID("{{survey_$surveyid}}");
                     }

diff --git a/application/views/admin/responses/browsemenubar_view.php b/application/views/admin/responses/browsemenubar_view.php
@@ -35,7 +35,7 @@
                 <?php }
                 if (hasSurveyPermission($surveyid, 'responses', 'create'))
                 { ?>
-                <a href='<?php echo $this->createUrl("admin/dataentry/view/surveyid/$surveyid"); ?>'>
+                <a href='<?php echo $this->createUrl("admin/dataentry/sa/view/surveyid/$surveyid"); ?>'>
                     <img src='<?php echo $sImageURL; ?>dataentry.png' alt='<?php $clang->eT("Dataentry Screen for Survey"); ?>' /></a>
                 <?php }
                 if (hasSurveyPermission($surveyid, 'statistics', 'read'))