mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-08-05 01:15:59 +02:00
commit caf6577e7f
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mod/forum/subscribers.php
View File

@ -100,7 +100,7 @@ $strsubscribers = get_string("subscribers", "forum");
$PAGE->navbar->add($strsubscribers);
$PAGE->set_title($strsubscribers);
$PAGE->set_heading($COURSE->fullname);
if (has_capability('mod/forum:managesubscriptions', $context)) {
if (has_capability('mod/forum:managesubscriptions', $context) && \mod_forum\subscriptions::is_forcesubscribed($forum) === false) {
if ($edit != -1) {
$USER->subscriptionsediting = $edit;
}
@ -112,11 +112,39 @@ echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('forum', 'forum').' '.$strsubscribers);
if (empty($USER->subscriptionsediting)) {
$subscribers = \mod_forum\subscriptions::fetch_subscribed_users($forum, $currentgroup, $context);
if (\mod_forum\subscriptions::is_forcesubscribed($forum)) {
$subscribers = mod_forum_filter_hidden_users($cm, $context, $subscribers);
}
echo $forumoutput->subscriber_overview($subscribers, $forum, $course);
} else if (\mod_forum\subscriptions::is_forcesubscribed($forum)) {
$subscriberselector->set_force_subscribed(true);
echo $forumoutput->subscribed_users($subscriberselector);
} else {
echo $forumoutput->subscriber_selection_form($existingselector, $subscriberselector);
}
echo $OUTPUT->footer();
/**
* Filters a list of users for whether they can see a given activity.
* If the course module is hidden (closed-eye icon), then only users who have
* the permission to view hidden activities will appear in the output list.
*
* @todo MDL-48625 This filtering should be handled in core libraries instead.
*
* @param stdClass $cm the course module record of the activity.
* @param context_module $context the activity context, to save re-fetching it.
* @param array $users the list of users to filter.
* @return array the filtered list of users.
*/
function mod_forum_filter_hidden_users(stdClass $cm, context_module $context, array $users) {
if ($cm->visible) {
return $users;
} else {
// Filter for users that can view hidden activities.
$filteredusers = array();
$hiddenviewers = get_users_by_capability($context, 'moodle/course:viewhiddenactivities');
foreach ($hiddenviewers as $hiddenviewer) {
if (array_key_exists($hiddenviewer->id, $users)) {
$filteredusers[$hiddenviewer->id] = $users[$hiddenviewer->id];
}
}
return $filteredusers;
}
}

15
mod/forum/tests/behat/forum_subscriptions_availability.feature
View File

@ -65,6 +65,21 @@ Feature: As a teacher I need to see an accurate list of subscribed users
And I should not see "Student 2"
And I should not see "Student 3"
@javascript
Scenario: A forced, hidden forum lists only teachers
When I add a "Forum" to section "1" and I fill the form with:
| Forum name | Forced Forum 2 |
| Forum type | Standard forum for general use |
| Description | Test forum description |
| Subscription mode | Forced subscription |
| Visible | Hide |
And I follow "Forced Forum 2"
And I follow "Show/edit current subscribers"
Then I should see "Teacher Teacher"
And I should not see "Student 1"
And I should not see "Student 2"
And I should not see "Student 3"
@javascript
Scenario: An automatic forum lists all subscribers
When I add a "Forum" to section "1" and I fill the form with: