Use getIid for BC + rename alias

pull/2487/head
jmontoyaa 9 years ago
parent d055964971
commit b6f47a2aad
  1. 1
      main/lp/learnpath.class.php
  2. 22
      main/lp/learnpathList.class.php

@ -4215,6 +4215,7 @@ class learnpath
$tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST); $tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST);
$link = 'lp/lp_controller.php?action=view&lp_id='.$lp_id.'&id_session='.$session_id; $link = 'lp/lp_controller.php?action=view&lp_id='.$lp_id.'&id_session='.$session_id;
$sql = "SELECT * FROM $tbl_tool $sql = "SELECT * FROM $tbl_tool
WHERE WHERE
c_id = ".$course_id." AND c_id = ".$course_id." AND

@ -68,9 +68,9 @@ class LearnpathList
$session_id = api_get_session_id(); $session_id = api_get_session_id();
} }
$condition_session = api_get_session_condition($session_id, true, true, 'Lp.sessionId'); $condition_session = api_get_session_condition($session_id, true, true, 'lp.sessionId');
$order = "ORDER BY Lp.displayOrder ASC, Lp.name ASC"; $order = "ORDER BY lp.displayOrder ASC, lp.name ASC";
if (isset($order_by)) { if (isset($order_by)) {
$order = Database::parse_conditions(array('order' => $order_by)); $order = Database::parse_conditions(array('order' => $order_by));
} }
@ -80,10 +80,10 @@ class LearnpathList
if ($check_publication_dates) { if ($check_publication_dates) {
$time_conditions = " AND ( $time_conditions = " AND (
(Lp.publicatedOn IS NOT NULL AND Lp.publicatedOn < '$now' AND Lp.expiredOn IS NOT NULL AND Lp.expiredOn > '$now') OR (lp.publicatedOn IS NOT NULL AND lp.publicatedOn < '$now' AND lp.expiredOn IS NOT NULL AND lp.expiredOn > '$now') OR
(Lp.publicatedOn IS NOT NULL AND Lp.publicatedOn < '$now' AND Lp.expiredOn IS NULL) OR (lp.publicatedOn IS NOT NULL AND lp.publicatedOn < '$now' AND lp.expiredOn IS NULL) OR
(Lp.publicatedOn IS NULL AND Lp.expiredOn IS NOT NULL AND Lp.expiredOn > '$now') OR (lp.publicatedOn IS NULL AND lp.expiredOn IS NOT NULL AND lp.expiredOn > '$now') OR
(Lp.publicatedOn IS NULL AND Lp.expiredOn IS NULL )) (lp.publicatedOn IS NULL AND lp.expiredOn IS NULL ))
"; ";
} }
@ -91,15 +91,15 @@ class LearnpathList
if ($ignoreCategoryFilter == false) { if ($ignoreCategoryFilter == false) {
if (!empty($categoryId)) { if (!empty($categoryId)) {
$categoryId = intval($categoryId); $categoryId = intval($categoryId);
$categoryFilter = " AND Lp.categoryId = $categoryId"; $categoryFilter = " AND lp.categoryId = $categoryId";
} else { } else {
$categoryFilter = " AND (Lp.categoryId = 0 OR Lp.categoryId IS NULL) "; $categoryFilter = " AND (lp.categoryId = 0 OR lp.categoryId IS NULL) ";
} }
} }
$dql = "SELECT Lp FROM ChamiloCourseBundle:CLp as Lp $dql = "SELECT lp FROM ChamiloCourseBundle:CLp as lp
WHERE WHERE
Lp.cId = $course_id lp.cId = $course_id
$time_conditions $time_conditions
$condition_session $condition_session
$categoryFilter $categoryFilter
@ -141,7 +141,7 @@ class LearnpathList
$vis = api_get_item_visibility( $vis = api_get_item_visibility(
api_get_course_info($course_code), api_get_course_info($course_code),
'learnpath', 'learnpath',
$row->getIid(), $row->getId(),
$session_id $session_id
); );

Loading…
Cancel
Save