Fixed issue #6226 & #6229: Only end message with Cannot edit answer (…

…token and edit answers after submitting activated) Dev: only load lastpage if submitdate == '' Dev: new functionnality : link to do survey with allowalloweditaftercompletion
LimeSurvey · Jun 18, 2012 · 3af73b4 · 3af73b4
1 parent b88d460
commit 3af73b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -1230,7 +1230,7 @@
                     $tokenoutput .= "<td align='left' style='white-space:nowrap;'>\n";
                     if (bHasSurveyPermission($surveyid, 'tokens','update'))
                     {
-                        if (($brow['completed'] == "N" || $brow['completed'] == "") &&$brow['token'])
+                        if ((($brow['completed'] == "N" || $brow['completed'] == "") && $brow['token']) || $thissurvey['alloweditaftercompletion']=='Y')
                         {
                             $toklang = ($brow['language'] == '') ? $baselanguage : $brow['language'];
                             $tokenoutput .= "<input style='height: 16; width: 16px; font-size: 8; font-family: verdana' type='image' src='$imageurl/do_16.png' title='"

diff --git a/index.php b/index.php
@@ -877,7 +877,7 @@
         if(($row['submitdate']==''  && $thissurvey['tokenanswerspersistence'] == 'Y' )|| ($row['submitdate']!='' && $thissurvey['alloweditaftercompletion'] == 'Y'))
         {
             $_SESSION['srid'] = $row['id'];
-            if (!is_null($row['lastpage']))
+            if (!is_null($row['lastpage']) && $row['submitdate']=='') 
             {
                 $_SESSION['LEMtokenResume'] = true;
                 $_SESSION['step'] = $row['lastpage'];