From bb64d4d3f4553d2860ad7ccd566410ab1bd9b505 Mon Sep 17 00:00:00 2001 From: Julio Date: Tue, 14 Sep 2021 15:47:28 +0200 Subject: [PATCH] Course: remove notifications --- public/main/inc/ajax/course_home.ajax.php | 21 ------------- public/main/inc/lib/course.lib.php | 36 ++--------------------- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/public/main/inc/ajax/course_home.ajax.php b/public/main/inc/ajax/course_home.ajax.php index 756d1d1d62..31d0db120a 100644 --- a/public/main/inc/ajax/course_home.ajax.php +++ b/public/main/inc/ajax/course_home.ajax.php @@ -708,27 +708,6 @@ switch ($action) { $response->records = $count; echo json_encode($response); - break; - case 'get_notification': - $courseId = isset($_REQUEST['course_id']) ? (int) $_REQUEST['course_id'] : 0; - $sessionId = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : 0; - $status = isset($_REQUEST['status']) ? (int) $_REQUEST['status'] : 0; - if (empty($courseId)) { - break; - } - require_once __DIR__.'/../global.inc.php'; - - $courseInfo = api_get_course_info_by_id($courseId); - $courseInfo['id_session'] = $sessionId; - $courseInfo['status'] = $status; - $id = 'notification_'.$courseId.'_'.$sessionId.'_'.$status; - - $notificationId = Session::read($id); - if ($notificationId) { - echo Display::show_notification($courseInfo, false); - Session::erase($notificationId); - } - break; default: echo ''; diff --git a/public/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php index d58e6820f6..f5b2a0e114 100644 --- a/public/main/inc/lib/course.lib.php +++ b/public/main/inc/lib/course.lib.php @@ -3524,9 +3524,7 @@ class CourseManager } else { $course_info['status'] = $courseUserInfo['status']; } - $show_notification = !api_get_configuration_value('hide_course_notification') - ? Display::show_notification($course_info) - : ''; + $params['edit_actions'] = ''; $params['document'] = ''; if (api_is_platform_admin()) { @@ -3577,10 +3575,6 @@ class CourseManager $params['image'] = $course_info['course_image_large']; } - if (Course::CLOSED != $course_info['visibility']) { - $params['notifications'] = $show_notification; - } - $params['is_special_course'] = true; $courseList[] = $params; } @@ -3685,11 +3679,6 @@ class CourseManager } $course_info['id_session'] = null; $course_info['status'] = $row['status']; - // For each course, get if there is any notification icon to show - // (something that would have changed since the user's last visit). - $showNotification = !api_get_configuration_value('hide_course_notification') - ? Display::show_notification($course_info) - : ''; $iconName = basename($course_info['course_image']); $params = []; @@ -3793,9 +3782,6 @@ class CourseManager ); } - if (Course::CLOSED != $course_info['visibility']) { - $params['notifications'] = $showNotification; - } $courseAdded[] = $course_info['real_id']; $courseList[] = $params; } @@ -3897,15 +3883,6 @@ class CourseManager $params['real_id'] = $course_info['real_id']; $params['visibility'] = $course_info['visibility']; - // Display the "what's new" icons - $notifications = ''; - if ( - (Course::CLOSED != $course_visibility && Course::HIDDEN != $course_visibility) || - !api_get_configuration_value('hide_course_notification') - ) { - $notifications .= Display::show_notification($course_info); - } - $sessionCourseAvailable = false; if ($session_accessible) { if (Course::CLOSED != $course_visibility || @@ -3927,7 +3904,7 @@ class CourseManager if (COURSEMANAGER === $userInCourseStatus || $sessionCourseAvailable) { $session_url = $course_info['course_public_url'].'?sid='.$course_info['id_session']; $session_title = ''. - $course_info['name'].''.$notifications; + $course_info['name'].''; } else { $session_title = $course_info['name']; } @@ -6141,12 +6118,6 @@ class CourseManager $course_info['id_session'] = null; $course_info['status'] = $course['status']; - // For each course, get if there is any notification icon to show - // (something that would have changed since the user's last visit). - $show_notification = !api_get_configuration_value('hide_course_notification') - ? Display::show_notification($course_info) - : ''; - // New code displaying the user's status in respect to this course. $status_icon = Display::return_icon( 'blackboard.png', @@ -6226,9 +6197,6 @@ class CourseManager $params['icon'] = $status_icon; $params['title'] = $course_title; $params['teachers'] = $teachers; - if (Course::CLOSED != $course_info['visibility']) { - $params['notifications'] = $show_notification; - } return $params; }