Browse Source

Minor - fix redirections because of the result page time limit

BT#15743
Julio Montoya 5 years ago
parent
commit
94062a2f4e
2 changed files with 19 additions and 15 deletions
  1. 4 3
      main/exercise/overview.php
  2. 15 12
      main/inc/lib/exercise.lib.php

+ 4 - 3
main/exercise/overview.php

@@ -302,10 +302,11 @@ if (!empty($attempts)) {
                 }
             }
 
-            if (!$objExercise->hasResultsAccess($attempt_result)) {
-                $attempt_link = '';
+            if (!empty($objExercise->getResultAccess())) {
+                if (!$objExercise->hasResultsAccess($attempt_result)) {
+                    $attempt_link = '';
+                }
             }
-
             $row['attempt_link'] = $attempt_link;
         }
         $my_attempt_array[] = $row;

+ 15 - 12
main/inc/lib/exercise.lib.php

@@ -4412,20 +4412,23 @@ EOT;
             }
         }
 
-        if ($objExercise->hasResultsAccess($exercise_stat_info) === false) {
-            echo Display::return_message(
-                sprintf(get_lang('YouPassedTheLimitOfXMinutesToSeeTheResults'), $objExercise->getResultsAccess())
-            );
+        if ($objExercise->getResultAccess()) {
+            if ($objExercise->hasResultsAccess($exercise_stat_info) === false) {
+                echo Display::return_message(
+                    sprintf(get_lang('YouPassedTheLimitOfXMinutesToSeeTheResults'), $objExercise->getResultsAccess())
+                );
 
-            return false;
-        }
+                return false;
+            }
 
-        if (!empty($objExercise->getResultAccess())) {
-            echo $objExercise->returnTimeLeftDiv();
-            echo $objExercise->showSimpleTimeControl(
-                $objExercise->getResultAccessTimeDiff($exercise_stat_info),
-                api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id
-            );
+            if (!empty($objExercise->getResultAccess())) {
+                echo $objExercise->returnTimeLeftDiv();
+                echo $objExercise->showSimpleTimeControl(
+                    $objExercise->getResultAccessTimeDiff($exercise_stat_info),
+                    api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq(
+                    ).'&exerciseId='.$objExercise->id
+                );
+            }
         }
 
         $counter = 1;