Permalink
Browse files

Merge branch 'm24_MDL-38336_SCORM_TOC_links_when_Display_course_struc…

…ture_is_on' of https://github.com/scara/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents cacbbb4 + 417d004 commit 48bf0941429a2b561019660ef0d98bef92deb237 @damyon damyon committed Mar 26, 2013
Showing with 12 additions and 4 deletions.
  1. +12 −4 mod/scorm/locallib.php
View
@@ -1625,13 +1625,21 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
}
} else if ($toclink == TOCFULLURL) {
$url = $CFG->wwwroot.'/mod/scorm/player.php?'.$sco->url;
- if ($sco->scormtype == 'sco') {
- $result->toc .= $sco->statusicon.'&nbsp;<a href="'.$url.'">'.format_string($sco->title).'</a>'.$score."\n";
+ if (!empty($sco->launch)) {
+ if ($sco->scormtype == 'sco') {
+ $result->toc .= $sco->statusicon.'&nbsp;<a href="'.$url.'">'.format_string($sco->title).'</a>'.$score."\n";
+ } else {
+ $result->toc .= '&nbsp;<a href="'.$url.'">'.format_string($sco->title).'</a>'.$score."\n";
+ }
} else {
- $result->toc .= '&nbsp;<a href="'.$url.'">'.format_string($sco->title).'</a>'.$score."\n";
+ if ($sco->scormtype == 'sco') {
+ $result->toc .= $sco->statusicon.'&nbsp;'.format_string($sco->title).$score."\n";
+ } else {
+ $result->toc .= '&nbsp;'.format_string($sco->title).$score."\n";
+ }
}
} else {
- if ($sco->launch) {
+ if (!empty($sco->launch)) {
if ($sco->scormtype == 'sco') {
$result->toc .= '<a title="'.$sco->url.'">'.$sco->statusicon.'&nbsp;'.format_string($sco->title).'&nbsp;'.$score.'</a>';
} else {

0 comments on commit 48bf094

Please sign in to comment.