Gradebook: Redirect to LP that contains the exercise in exercise link

Refs #2184

main/gradebook/exercise_jump.php

@@ -22,18 +22,6 @@ $cidReq = Security::remove_XSS($_GET['cidReq']);
 $type = Security::remove_XSS($_GET['type']);
 $doExerciseUrl = '';
 
-if (isset($_GET['doexercise'])) {
-    $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query([
-        'session_id' => $session_id,
-        'cidReq' => $cidReq,
-        'gradebook' => $gradebook,
-        'origin' => '',
-        'learnpath_id' => '',
-        'learnpath_item_id' => '',
-        'exerciseId' => intval($_GET['doexercise']),
-    ]);
-}
-
 // no support for hot potatoes
 if ($type == LINK_HOTPOTATOES) {
     $exerciseId = $_GET['exerciseId'];
@@ -49,7 +37,7 @@ if ($type == LINK_HOTPOTATOES) {
     exit;
 }
 
-if (isset($_GET['doexercise'])) {
+if (!empty($doExerciseUrl)) {
     header('Location: '.$doExerciseUrl);
     exit;
 } else {
@@ -76,6 +64,16 @@ if (isset($_GET['doexercise'])) {
                         $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=list';
                     }
                 }
+            } else {
+                $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query([
+                    'session_id' => $session_id,
+                    'cidReq' => $cidReq,
+                    'gradebook' => $gradebook,
+                    'origin' => '',
+                    'learnpath_id' => '',
+                    'learnpath_item_id' => '',
+                    'exerciseId' => (int) $_GET['exerciseId'],
+                ]);
             }
         }
     }

main/gradebook/lib/be/exerciselink.class.php

@@ -388,9 +388,6 @@ class ExerciseLink extends AbstractLink
         $path = isset($data['path']) ? $data['path'] : '';
 
         $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?path='.$path.'&session_id='.$sessionId.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$exerciseId.'&type='.$this->get_type();
-        if ((!api_is_allowed_to_edit() && $this->calc_score($user_id) == null) || $status_user != 1) {
-            $url .= '&doexercise='.$exerciseId;
-        }
 
         return $url;
     }