Fixing course tool visibility (hide/show links in course home) when a teacher is a teacher of a course and is also a coach of a session within the course see BT#6369

1.9.x
Julio Montoya 12 years ago
parent b13415c01f
commit 819b72947d
  1. 5
      main/course_home/activity.php
  2. 1
      main/cron/import_csv.php
  3. 12
      main/inc/lib/course_home.lib.php

@ -56,7 +56,8 @@ if (api_is_platform_admin()) {
// COURSE ADMIN ONLY VIEW
// Start of tools for CourseAdmins (teachers/tutors)
if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
if ($session_id == 0 && api_is_course_admin()) {
$content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:0px;">
<div class="normal-message" id="id_normal_message" style="display:none">';
$content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
@ -119,4 +120,4 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
function return_block($title, $content) {
$html = '<div class="row"><div class="span12"><div class="page-header"><h3>'.$title.'</h3></div></div></div><div class="row">'.$content.'</div>';
return $html;
}
}

@ -557,7 +557,6 @@ class ImportCsv
echo $sql.PHP_EOL;
// Sessions
$table = Database::get_main_table(TABLE_MAIN_SESSION);
$sql = "DELETE FROM $table";
Database::query($sql);

@ -600,10 +600,16 @@ class CourseHome
}
}
$web_code_path = api_get_path(WEB_CODE_PATH);
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$session_id = api_get_session_id();
if ($session_id == 0 ) {
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
} else {
$is_allowed_to_edit = api_is_allowed_to_edit(null, true) && !api_is_coach();
}
$is_platform_admin = api_is_platform_admin();
$session_id = api_get_session_id();
$i = 0;
$items = array();
@ -641,7 +647,7 @@ class CourseHome
unset($lnk);
$item['extra'] = null;
if ($is_allowed_to_edit && !api_is_coach()) {
if ($is_allowed_to_edit) {
if (empty($session_id)) {
if ($tool['visibility'] == '1' && $tool['admin'] != '1') {

Loading…
Cancel
Save