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

Merge branch 'MDL-83558-main' of https://github.com/andrewgos/moodle

Browse Source
This commit is contained in:
Mihail Geshoski
2025-07-22 13:56:00 +08:00
parent ef6df9e70e 9f68226804
commit f7e6f3e9e8
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/mod/forum/classes/local/renderers/discussion_list.php
+10 -3
View File
@@ -385,14 +385,21 @@ class discussion_list {
if ($forum->is_in_group_mode() && !$capabilitymanager->can_access_all_groups($user)) {
if ($groupid === null) {
if (!$capabilitymanager->can_post_to_my_groups($user)) {
$isvisiblegroupsmode = $forum->get_effective_group_mode() == VISIBLEGROUPS;
$isgroupmember = !empty(groups_get_user_groups($forum->get_course_id(), $user->id)[0]);
if (
!$capabilitymanager->can_post_to_my_groups($user)
&& $isvisiblegroupsmode
&& $isgroupmember
) {
$notifications[] = (new notification(
get_string('cannotadddiscussiongroup', 'mod_forum'),
get_string('cannotadddiscussionall', 'mod_forum'),
\core\output\notification::NOTIFY_WARNING
))->set_show_closebutton();
} else {
$notifications[] = (new notification(
get_string('cannotadddiscussionall', 'mod_forum'),
get_string('cannotadddiscussiongroup', 'mod_forum'),
\core\output\notification::NOTIFY_WARNING
))->set_show_closebutton();
}
public/mod/forum/tests/behat/separate_group_discussions.feature
+2 -2
View File
@@ -193,14 +193,14 @@ Feature: Posting to all groups in a separate group discussion is restricted to u
When I am on the "Standard forum name" "forum activity" page logged in as student4
Then I should see "All participants"
And I should see "Initial Disc ALL"
And I should see "You are not able to create a discussion"
And I should see "You are not able to create a discussion because you are not a member of any group."
And I should not see "Add discussion topic"
Scenario: Students in non-participation groups can see all group discussions, but not post.
When I am on the "Standard forum name" "forum activity" page logged in as student3
Then I should see "All participants"
And I should see "Initial Disc ALL"
And I should see "You are not able to create a discussion"
And I should see "You are not able to create a discussion because you are not a member of any group."
And I should not see "Add discussion topic"
Scenario: Students in multiple group can post in all of their group individually
public/mod/forum/tests/behat/visible_group_discussions.feature
+2 -2
View File
@@ -259,7 +259,7 @@ Feature: Posting to all groups in a visible group discussion is restricted to us
And I should see "Initial Disc G1"
And I should see "Initial Disc G2"
And I should see "Initial Disc G2"
And I should see "You are not able to create a discussion"
And I should see "You are not able to create a discussion because you are not a member of any group."
And I should not see "Add discussion topic"
Scenario: Students in non-participation groups can see all discussions, but not post.
@@ -271,5 +271,5 @@ Feature: Posting to all groups in a visible group discussion is restricted to us
And I should see "Initial Disc G1"
And I should see "Initial Disc G2"
And I should see "Initial Disc G2"
And I should see "You are not able to create a discussion"
And I should see "You do not have permission to add a new discussion topic for all participants."
And I should not see "Add discussion topic"