Tickets: Fix filter by session id in getLpList function

chamilo · Nov 18, 2020 · d6b7c4b · d6b7c4b
1 parent 1d11bd7
commit d6b7c4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/main/inc/ajax/lp.ajax.php b/main/inc/ajax/lp.ajax.php
@@ -22,8 +22,9 @@
 switch ($action) {
     case 'get_lp_list_by_course':
         $course_id = (isset($_GET['course_id']) && !empty($_GET['course_id'])) ? (int) $_GET['course_id'] : 0;
+        $session_id = (isset($_GET['session_id']) && !empty($_GET['session_id'])) ? (int) $_GET['session_id'] : 0;
         $onlyActiveLp = !(api_is_platform_admin(true) || api_is_course_admin());
-        $results = learnpath::getLpList($course_id, $onlyActiveLp);
+        $results = learnpath::getLpList($course_id, $session_id, $onlyActiveLp);
         $data= [];
 
         if (!empty($results)) {

diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
@@ -12207,18 +12207,23 @@ public static function moveDownCategory($id)
         }
     }
 
-    public static function getLpList($courseId, $onlyActiveLp = true)
+    public static function getLpList($courseId, $sessionId, $onlyActiveLp = true)
     {
         $TABLE_LP = Database::get_course_table(TABLE_LP_MAIN);
         $TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
         $courseId = (int) $courseId;
+        $sessionId = (int) $sessionId;
 
         $sql = "SELECT lp.id, lp.name
                 FROM $TABLE_LP lp
                 INNER JOIN $TABLE_ITEM_PROPERTY ip
                 ON lp.id = ip.ref
                 WHERE lp.c_id = $courseId ";
 
+        if (!empty($sessionId)) {
+            $sql .= "AND ip.session_id = $sessionId ";
+        }
+
         if ($onlyActiveLp) {
             $sql .= "AND ip.tool = 'learnpath' ";
             $sql .= "AND ip.visibility = 1 ";

diff --git a/main/ticket/new_ticket.php b/main/ticket/new_ticket.php
@@ -13,6 +13,7 @@
 
 api_block_anonymous_users();
 $courseId = api_get_course_int_id();
+$sessionId = api_get_session_id();
 $exerciseId = (isset($_GET['exerciseId']) && !empty($_GET['exerciseId'])) ? (int) $_GET['exerciseId'] : 0;
 $lpId = (isset($_GET['lpId']) && !empty($_GET['lpId'])) ? (int) $_GET['lpId'] : 0;
 
@@ -73,13 +74,14 @@ function updateExerciseList(courseId, sessionId) {
     }, "json");
 }
 
-function updateLpList(courseId) {
+function updateLpList(courseId, sessionId) {
     var $selectLp = $("select#lp_id");
     $selectLp.empty();
 
     $.get("'.api_get_path(WEB_AJAX_PATH).'lp.ajax.php", {
         a: "get_lp_list_by_course",
-        course_id: courseId
+        course_id: courseId,
+        session_id: sessionId
     }, function (lpList) {
         $("<option>", {
             value: 0,
@@ -121,12 +123,12 @@ function updateLpList(courseId) {
         updateLpList(courseId);
     });
 
-    var sessionId = $selectSession.val();
+    var sessionId = $selectSession.val() ? $selectSession.val() : '.$sessionId.';
     var courseId = $selectCourse.val() ? $selectCourse.val() : '.$courseId.';
 
     updateCourseList(sessionId);
     updateExerciseList(courseId, sessionId);
-    updateLpList(courseId);
+    updateLpList(courseId, sessionId);
 });
 
 var counter_image = 1;