chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sort courses is now always available (for students, teachers, etc) even if the Course catalog option is set to false see BT#3199

Browse Source
skala
Julio Montoya 14 years ago
parent b3594e03bf
commit ea263976d0
2 changed files with 47 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      main/auth/courses.php
  2. 49
      main/inc/lib/userportal.lib.php

32
main/auth/courses.php
Unescape View File

@ -58,15 +58,25 @@ if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
// Section for the tabs.
$this_section = SECTION_COURSES;
// Acces rights: anonymous users can't do anything usefull here.
// Access rights: anonymous users can't do anything useful here.
api_block_anonymous_users();
if (!(api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course())) {
if (api_get_setting('allow_students_to_browse_courses') == 'false') {
api_not_allowed();
}
$user_can_view_page = false;
//For students
if (api_get_setting('allow_students_to_browse_courses') == 'false') {
$user_can_view_page = false;
} else {
$user_can_view_page = true;
}
//For teachers/admins
if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
$user_can_view_page = true;
}
// filter actions
$actions = array('sortmycourses', 'createcoursecategory', 'subscribe', 'deletecoursecategory', 'unsubscribe', 'display_courses','display_random_courses');
$action = 'display_random_courses';
@ -179,12 +189,18 @@ switch ($action) {
$courses_controller->categories_list($action);
break;
case 'deletecoursecategory':
case 'sortmycourses':
$courses_controller->courses_list($action);
break;
case 'subscribe':
case 'sortmycourses':
$courses_controller->courses_list($action);
break;
case 'subscribe':
case 'display_random_courses':
$courses_controller->courses_categories($action);
if ($user_can_view_page) {
$courses_controller->courses_categories($action);
} else {
api_not_allowed();
}
break;
case 'display_courses':
$courses_controller->courses_categories($action, $_GET['category_code']);

49
main/inc/lib/userportal.lib.php
Unescape View File

@ -957,36 +957,33 @@ class IndexManager {
}
// My account section.
if ($show_menu) {
$my_account_content = '<ul class="menulist">';
if ($show_create_link) {
$my_account_content .= '<li><a href="main/create_course/add_course.php">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
if ($show_course_link) {
if (!api_is_drh()) {
$my_account_content .= '<li><a href="main/auth/courses.php">'.get_lang('CourseManagement').'</a></li>';
$url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
$my_account_content .= Display::url(get_lang('SortMyCourses'), $url);
if (api_get_setting('use_session_mode') == 'true') {
if (isset($_GET['history']) && intval($_GET['history']) == 1) {
$my_account_content .= '<li><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
} else {
$my_account_content .= '<li><a href="user_portal.php?history=1">'.get_lang('HistoryTrainingSessions').'</a></li>';
}
// My account section
$my_account_content = '<ul class="menulist">';
if ($show_create_link) {
$my_account_content .= '<li><a href="main/create_course/add_course.php">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
//Sort courses
$url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
$my_account_content .= Display::url(get_lang('SortMyCourses'), $url);
//Course management
if ($show_course_link) {
if (!api_is_drh()) {
$my_account_content .= '<li><a href="main/auth/courses.php">'.get_lang('CourseManagement').'</a></li>';
if (api_get_setting('use_session_mode') == 'true') {
if (isset($_GET['history']) && intval($_GET['history']) == 1) {
$my_account_content .= '<li><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
} else {
$my_account_content .= '<li><a href="user_portal.php?history=1">'.get_lang('HistoryTrainingSessions').'</a></li>';
}
} else {
$my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
}
} else {
$my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
}
if ($show_digest_link) {
//digest never used?
//$my_account_content .= Display :: display_digest($toolsList, $digest, $orderKey, $courses);
}
$my_account_content .= '</ul>';
}
$my_account_content .= '</ul>';
if (!empty($my_account_content)) {
$html = self::show_right_block(get_lang('MenuUser'), $my_account_content);

Write Preview
Loading…
Cancel
Save