mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-73758 availability: fix info::is_available_for_all()

Browse Source 
Should only return true early when the config setting is disabled,
not when it's enabled.
This commit is contained in:
Jake Dallimore 2022-02-03 16:22:20 +08:00
parent c352b70022
commit b6e9d54a38
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
availability/classes/info.php
View File

@ -233,7 +233,7 @@ abstract class info {
*/
public function is_available_for_all() {
global $CFG;
if (is_null($this->availability) || !empty($CFG->enableavailability)) {
if (is_null($this->availability) || empty($CFG->enableavailability)) {
return true;
} else {
try {

30
availability/tests/info_test.php
View File

@ -540,4 +540,34 @@ class info_testcase extends advanced_testcase {
$this->assertDebuggingCalled('Error processing availability data for ' .
'‘Page1’: Invalid availability text');
}
/**
* Test for the is_available_for_all() method of the info base class.
* @covers \core_availability\info_module::is_available_for_all
*/
public function test_is_available_for_all() {
global $CFG, $DB;
$this->resetAfterTest();
$CFG->enableavailability = 0;
$generator = $this->getDataGenerator();
$course = $generator->create_course();
$page = $generator->get_plugin_generator('mod_page')->create_instance(['course' => $course]);
// Set an availability restriction and reset the modinfo cache.
// The enableavailability setting is disabled so this does not take effect yet.
$notavailable = '{"op":"|","show":true,"c":[{"type":"mock","a":false}]}';
$DB->set_field('course_modules', 'availability', $notavailable, ['id' => $page->cmid]);
get_fast_modinfo($course, 0, true);
// Availability is disabled, so we expect this module to be available for everyone.
$modinfo = get_fast_modinfo($course);
$info = new info_module($modinfo->get_cm($page->cmid));
$this->assertTrue($info->is_available_for_all());
// Now, enable availability restrictions, and check again.
// This time, we expect it to return false, because of the access restriction.
$CFG->enableavailability = 1;
$this->assertFalse($info->is_available_for_all());
}
}