L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-64820 forum: fix notifications for discussions in group mode

Browse Source
This commit is contained in:
Ryan Wyllie
2019-03-22 09:31:21 +08:00
parent 57ad9a0ce7
commit 15f7dbe573
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/classes/local/managers/capability.php
+12 -2
View File
@@ -144,7 +144,7 @@ class capability {
* @param stdClass $user The user to check
* @return bool
*/
public function can_access_all_groups(stdClass $user) {
public function can_access_all_groups(stdClass $user) : bool {
return has_capability('moodle/site:accessallgroups', $this->get_context(), $user);
}
@@ -155,7 +155,7 @@ class capability {
* @param int $groupid The id of the group that the forum is set to
* @return bool
*/
public function can_access_group(stdClass $user, int $groupid) {
public function can_access_group(stdClass $user, int $groupid) : bool {
if ($this->can_access_all_groups($user)) {
// This user has access to all groups.
return true;
@@ -167,6 +167,16 @@ class capability {
return groups_is_member($groupid, $user->id);
}
/**
* Can the user post to their groups?
*
* @param stdClass $user The user to check
* @return bool
*/
public function can_post_to_my_groups(stdClass $user) : bool {
return has_capability('mod/forum:canposttomygroups', $this->get_context(), $user);
}
/**
* Can the user view discussions in this forum?
*
mod/forum/classes/local/renderers/discussion_list.php
+21 -13
View File
@@ -154,7 +154,13 @@ class discussion_list {
$discussions = $this->get_discussions($user, $groupids, $sortorder, $pageno, $pagesize);
$forumview = [
'forum' => (array) $forumexporter->export($this->renderer)
'forum' => (array) $forumexporter->export($this->renderer),
'groupchangemenu' => groups_print_activity_menu(
$cm,
$this->urlfactory->get_forum_view_url_from_forum($forum),
true
),
'notifications' => $this->get_notifications($user, $groupid)
];
if (!$discussions) {
@@ -169,12 +175,6 @@ class discussion_list {
$forumview = array_merge(
$forumview,
[
'notifications' => $this->get_notifications($user, $groupid),
'groupchangemenu' => groups_print_activity_menu(
$cm,
$this->urlfactory->get_forum_view_url_from_forum($forum),
true
),
'pagination' => $this->renderer->render(new \paging_bar($alldiscussionscount, $pageno, $pagesize, $PAGE->url, 'p')),
],
$exportedposts
@@ -348,12 +348,20 @@ class discussion_list {
))->set_show_closebutton();
}
if ($forum->is_in_group_mode()) {
if (
($groupid === null && !$capabilitymanager->can_access_all_groups($user)) ||
($groupid !== null && !$capabilitymanager->can_access_group($user, $groupid))
) {
// Cannot post to the current group.
if ($forum->is_in_group_mode() && !$capabilitymanager->can_access_all_groups($user)) {
if ($groupid === null) {
if (!$capabilitymanager->can_post_to_my_groups($user)) {
$notifications[] = (new notification(
get_string('cannotadddiscussiongroup', 'mod_forum'),
\core\output\notification::NOTIFY_WARNING
))->set_show_closebutton();
} else {
$notifications[] = (new notification(
get_string('cannotadddiscussionall', 'mod_forum'),
\core\output\notification::NOTIFY_WARNING
))->set_show_closebutton();
}
} else if (!$capabilitymanager->can_access_group($user, $groupid)) {
$notifications[] = (new notification(
get_string('cannotadddiscussion', 'mod_forum'),
\core\output\notification::NOTIFY_WARNING