Allow base course exercises and links in LP build.

Show course base LPs in prerequisite see BT#12238
ofaj
jmontoyaa 9 years ago
parent c414bad209
commit f7dade7c98
  1. 15
      main/lp/learnpath.class.php
  2. 6
      main/lp/lp_build.php

@ -2652,6 +2652,7 @@ class learnpath
if (isset($size)) { if (isset($size)) {
$info = pathinfo($preview_image); $info = pathinfo($preview_image);
$image_custom_size = $info['filename'].'.'.$size.'.'.$info['extension']; $image_custom_size = $info['filename'].'.'.$size.'.'.$info['extension'];
if (file_exists($image_sys_path.$image_custom_size)) { if (file_exists($image_sys_path.$image_custom_size)) {
if ($path_type == 'web') { if ($path_type == 'web') {
return $image_path.$image_custom_size; return $image_path.$image_custom_size;
@ -8714,7 +8715,7 @@ class learnpath
$row = Database :: fetch_array($result); $row = Database :: fetch_array($result);
$prerequisiteId = $row['prerequisite']; $prerequisiteId = $row['prerequisite'];
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$session_condition = api_get_session_condition($session_id); $session_condition = api_get_session_condition($session_id, true, true);
$sql = "SELECT * FROM $tbl_lp $sql = "SELECT * FROM $tbl_lp
WHERE c_id = $course_id $session_condition WHERE c_id = $course_id $session_condition
ORDER BY display_order "; ORDER BY display_order ";
@ -8822,7 +8823,7 @@ class learnpath
$tbl_quiz = Database :: get_course_table(TABLE_QUIZ_TEST); $tbl_quiz = Database :: get_course_table(TABLE_QUIZ_TEST);
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id); $condition_session = api_get_session_condition($session_id, true, true);
$setting = api_get_configuration_value('show_invisible_exercise_in_lp_list'); $setting = api_get_configuration_value('show_invisible_exercise_in_lp_list');
@ -8894,9 +8895,15 @@ class learnpath
$moveEverywhereIcon = Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY); $moveEverywhereIcon = Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id, true, null, "link.session_id"); $condition_session = api_get_session_condition(
$session_id,
true,
true,
"link.session_id"
);
$sql = "SELECT link.id as link_id, $sql = "SELECT
link.id as link_id,
link.title as link_title, link.title as link_title,
link.category_id as category_id, link.category_id as category_id,
link_category.category_title as category_title link_category.category_title as category_title

@ -24,9 +24,9 @@ $tbl_lp = Database::get_course_table(TABLE_LP_MAIN);
$tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM); $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
$tbl_lp_view = Database::get_course_table(TABLE_LP_VIEW); $tbl_lp_view = Database::get_course_table(TABLE_LP_VIEW);
$isStudentView = (int) $_REQUEST['isStudentView']; $isStudentView = (int)$_REQUEST['isStudentView'];
$learnpath_id = (int) $_REQUEST['lp_id']; $learnpath_id = (int)$_REQUEST['lp_id'];
$submit = $_POST['submit_button']; $submit = $_POST['submit_button'];
/* MAIN CODE */ /* MAIN CODE */
if ((!$is_allowed_to_edit) || ($isStudentView)) { if ((!$is_allowed_to_edit) || ($isStudentView)) {

Loading…
Cancel
Save