moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-51123 mod_scorm: Do not display SCO with invisible = false

Browse source
This commit is contained in:
Juan Leyva 2015-12-29 17:25:25 +01:00
parent ea3ebbf20e
commit 7f28e8a58f
1 changed files with 66 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/scorm/locallib.php
View file

@ -1444,7 +1444,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
if (!empty($organizationsco)) { if (!empty($organizationsco)) {
$result[0] = $organizationsco; $result[0] = $organizationsco;
$result[0]->isvisible = true; $result[0]->isvisible = 'true';
$result[0]->statusicon = ''; $result[0]->statusicon = '';
$result[0]->url = ''; $result[0]->url = '';
} }
@ -1464,7 +1464,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
} }
foreach ($scoes as $sco) { foreach ($scoes as $sco) {
if (!isset($sco->isvisible)) { if (!isset($sco->isvisible)) {
$sco->isvisible = true; $sco->isvisible = 'true';
} }
if (empty($sco->title)) { if (empty($sco->title)) {
@ -1477,7 +1477,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
$sco->prereq = empty($sco->prerequisites) || scorm_eval_prerequisites($sco->prerequisites, $usertracks); $sco->prereq = empty($sco->prerequisites) || scorm_eval_prerequisites($sco->prerequisites, $usertracks);
} }
if ($sco->isvisible) { if ($sco->isvisible === 'true') {
if (!empty($sco->launch)) { if (!empty($sco->launch)) {
if (empty($scoid) && ($mode != 'normal')) { if (empty($scoid) && ($mode != 'normal')) {
$scoid = $sco->id; $scoid = $sco->id;
@ -1667,12 +1667,14 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
$prevsco = ''; $prevsco = '';
if (!empty($scoes)) { if (!empty($scoes)) {
foreach ($scoes as $sco) { foreach ($scoes as $sco) {
if ($sco->isvisible === 'false') {
continue;
}
$result->toc .= html_writer::start_tag('li'); $result->toc .= html_writer::start_tag('li');
$scoid = $sco->id; $scoid = $sco->id;
$sco->isvisible = true;
if ($sco->isvisible) {
$score = ''; $score = '';
if (isset($usertracks[$sco->identifier])) { if (isset($usertracks[$sco->identifier])) {
@ -1747,10 +1749,6 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
} }
} }
} else {
$result->toc .= " ".format_string($sco->title);
}
if (!empty($sco->children)) { if (!empty($sco->children)) {
$result->toc .= html_writer::start_tag('ul'); $result->toc .= html_writer::start_tag('ul');
$childresult = scorm_format_toc_for_treeview($user, $scorm, $sco->children, $usertracks, $cmid, $childresult = scorm_format_toc_for_treeview($user, $scorm, $sco->children, $usertracks, $cmid,