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

UserGroup - Improve feedback messages after registration course - refs BT#20253

Browse Source
pull/4404/head
Christian 3 years ago
parent adca808c81
commit 53376951b2
1 changed files with 66 additions and 20 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. 86
      main/inc/lib/usergroup.lib.php

86
main/inc/lib/usergroup.lib.php
Unescape View File

@ -1031,6 +1031,8 @@ class UserGroup extends Model
$course_info = api_get_course_info_by_id($course_id);
if ($course_info) {
if (!empty($user_list)) {
$messageError = [];
$messageOk = [];
foreach ($user_list as $user_id) {
$subscribed = CourseManager::subscribeUser(
$user_id,
@ -1041,20 +1043,41 @@ class UserGroup extends Model
true,
false
);
$userInfo = api_get_user_info($user_id);
if (!$subscribed) {
$userInfo = api_get_user_info($user_id);
Display::addFlash(
Display::return_message(
sprintf(
get_lang('UserXNotSubscribedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
),
'error'
)
$messageError[] = sprintf(
get_lang('UserXNotSubscribedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
);
} else {
$messageOk[] = sprintf(
get_lang('UserXAddedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
);
}
}
if (!empty($messageError)) {
$strMessagesError = implode('<br>', $messageError);
Display::addFlash(
Display::return_message(
$strMessagesError,
'error',
false
)
);
}
if (!empty($messageOk)) {
$strMessagesOk = implode('<br>', $messageOk);
Display::addFlash(
Display::return_message(
$strMessagesOk,
'normal',
false
)
);
}
}
$params = [
'course_id' => $course_id,
@ -1226,6 +1249,8 @@ class UserGroup extends Model
foreach ($new_items as $user_id) {
// Adding courses
if (!empty($course_list)) {
$messageError = [];
$messageOk = [];
foreach ($course_list as $course_id) {
$course_info = api_get_course_info_by_id($course_id);
$subscribed = CourseManager::subscribeUser(
@ -1237,20 +1262,41 @@ class UserGroup extends Model
true,
false
);
$userInfo = api_get_user_info($user_id);
if (!$subscribed) {
$userInfo = api_get_user_info($user_id);
Display::addFlash(
Display::return_message(
sprintf(
get_lang('UserXNotSubscribedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
),
'error'
)
$messageError[] = sprintf(
get_lang('UserXNotSubscribedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
);
} else {
$messageOk[] = sprintf(
get_lang('UserXAddedToCourseX'),
$userInfo['complete_name_with_username'],
$course_info['title']
);
}
}
if (!empty($messageError)) {
$strMessagesError = implode('<br>', $messageError);
Display::addFlash(
Display::return_message(
$strMessagesError,
'error',
false
)
);
}
if (!empty($messageOk)) {
$strMessagesOk = implode('<br>', $messageOk);
Display::addFlash(
Display::return_message(
$strMessagesOk,
'normal',
false
)
);
}
}
$params = [
'user_id' => $user_id,

Write Preview
Loading…
Cancel
Save