Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions public/main/inc/ajax/model.ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -2649,13 +2649,25 @@ function getWhereClause($col, $oper, $val)
$course_id,
api_get_session_id()
)) {
$url = 'class.php?action=remove_class_from_course&id='.$group['id'].'&'.api_get_cidreq(
).'&id_session='.api_get_session_id();
$icon = Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Remove'));
$actions = [
[
'icon' => Display::getMdiIcon(ActionIcon::RESET, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Remove the class without removing students')),
'url' => 'class.php?action=remove_only_usergroup_from_course&id=' . $group['id'] . '&' . api_get_cidreq() . '&id_session=' . api_get_session_id(),
'onclick' => "if (!confirm('". get_lang('Are you sure you want to remove the class without removing users?') . "')) return false;"
],
[
'icon' => Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Remove')),
'url' => 'class.php?action=remove_usergroup_from_course&id=' . $group['id'] . '&' . api_get_cidreq() . '&id_session=' . api_get_session_id(),
'onclick' => "if (!confirm('". get_lang('Are you sure you want to remove the class?') . "')) return false;"
],
];
} else {
$url = 'class.php?action=add_class_to_course&id='.$group['id'].'&'.api_get_cidreq(
).'&type=not_registered';
$icon = Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add'));
$actions = [
[
'icon' => Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add')),
'url' => 'class.php?action=add_usergroup_to_course&id=' . $group['id'] . '&' . api_get_cidreq() . '&type=not_registered',
]
];
}

switch ($group['group_type']) {
Expand All @@ -2678,7 +2690,14 @@ function getWhereClause($col, $oper, $val)
$urlUserGroup.'&id='.$group['id']
).' ';
}
$group['actions'] .= Display::url($icon, $url);

for ($i = 0; $i < count($actions); $i++) {
$group['actions'] .= Display::url(
$actions[$i]['icon'],
$actions[$i]['url'] ?? null,
['onclick' => $actions[$i]['onclick'] ?? '']
);
}
}
$new_result[] = $group;
}
Expand Down
30 changes: 30 additions & 0 deletions public/main/inc/lib/usergroup.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,36 @@ public function unsubscribe_courses_from_usergroup($usergroup_id, $delete_items,
}
}

public function unsubscribeOnlyCoursesFromUsergroup($usergroup_id, $delete_items, $sessionId = 0)
{
$sessionId = (int) $sessionId;
// Deleting items.
if (!empty($delete_items)) {
$user_list = $this->get_users_by_usergroup($usergroup_id);

$groupId = isset($_GET['id']) ? (int) $_GET['id'] : 0;
foreach ($delete_items as $course_id) {
$course_info = api_get_course_info_by_id($course_id);
if ($course_info) {
Database::delete(
$this->usergroup_rel_course_table,
[
'usergroup_id = ? AND course_id = ?' => [
$usergroup_id,
$course_id,
],
]
);
}
if (0 != $sessionId && 0 != $groupId) {
$this->subscribe_sessions_to_usergroup($groupId, [0]);
} else {
$s = $sessionId;
}
}
}
}

/**
* Subscribe users to a group.
*
Expand Down
16 changes: 14 additions & 2 deletions public/main/user/class.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
$actions = Display::toolbarAction('actions-class', [$actionsLeft, $actionsRight]);
$action = isset($_GET['action']) ? $_GET['action'] : null;
switch ($action) {
case 'add_class_to_course':
case 'add_usergroup_to_course':
$id = $_GET['id'];
if (!empty($id) && 0 == $sessionId) {
$usergroup->subscribe_courses_to_usergroup(
Expand All @@ -99,7 +99,7 @@
exit;
}
break;
case 'remove_class_from_course':
case 'remove_usergroup_from_course':
$id = $_GET['id'];
if (!empty($id)) {
$usergroup->unsubscribe_courses_from_usergroup(
Expand All @@ -109,6 +109,18 @@
Display::addFlash(Display::return_message(get_lang('Deleted')));
}
break;
case 'remove_only_usergroup_from_course':
// remove usergroup but not users from course
$id = $_GET['id'];
if (!empty($id)) {
$usergroup->unsubscribeOnlyCoursesFromUsergroup(
$id,
[api_get_course_int_id()]
);
Display::addFlash(Display::return_message(get_lang('Removed')));
}
break;

}
}

Expand Down
9 changes: 9 additions & 0 deletions translations/messages.en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -33058,3 +33058,12 @@ msgstr "Constant name"

msgid "MDI icon name"
msgstr "MDI icon name"

msgid "Are you sure you want to remove the class?"
msgstr "Are you sure you want to remove the class?"

msgid "Are you sure you want to remove the class without removing users?"
msgstr "Are you sure you want to remove the class without removing users?"



Loading