From e9a6fbc4e22f62ee37f0b222edbf629f3d6a8da9 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Fri, 27 Nov 2020 14:48:52 +0100
Subject: [PATCH] Exercise: Add reset option to remove test in-session context
 - refs #3580

---
 main/exercise/admin.php       | 6 +++++-
 main/inc/lib/exercise.lib.php | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/exercise/admin.php b/main/exercise/admin.php
index 95bafefa3c..2978f73a3c 100755
--- a/main/exercise/admin.php
+++ b/main/exercise/admin.php
@@ -49,6 +49,10 @@ require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_QUIZ;
 $this_section = SECTION_COURSES;
 
+if ($_GET['r'] == 1) {
+    Exercise::cleanSessionVariables();
+}
+
 // Access control
 api_protect_course_script(true);
 
@@ -422,7 +426,7 @@ if ($newQuestion || $editQuestion) {
             echo '</div>';
         } else {
             require 'question_admin.inc.php';
-            ExerciseLib::showExtraInfoWhereQuestionUsed($objQuestion->iid);
+            ExerciseLib::showTestsWhereQuestionIsUsed($objQuestion->iid, $objExercise->selectId());
         }
     }
 }
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index 6634108fec..e81b672478 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -1688,7 +1688,8 @@ HOTSPOT;
                 $tmp[0] = $row['course_title'];
                 $tmp[1] = $row['session_name'];
                 $tmp[2] = $row['quiz_title'];
-                $urlToQuiz = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$row['quiz_id'];
+                // Send do other test with r=1 to reset current test session variables
+                $urlToQuiz = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$row['quiz_id'].'&r=1';
                 $tmp[3] = '<a href="'.$urlToQuiz.'">'.Display::return_icon('quiz.png', get_lang('Edit')).'</a>';
                 if ((int) $row['session_id'] == 0) {
                     $tmp[1] = '-';