mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-57020-master-allow_delete_unused_scale' of https://github.com/sharidas/moodle

Browse Source
This commit is contained in:
Adrian Greeve 2021-01-21 12:01:32 +08:00
commit 3f2462a5c7
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/grade/tests/grade_scale_test.php
View File

@ -167,5 +167,9 @@ class core_grade_scale_testcase extends grade_base_testcase {
$this->assertNotEmpty($grade_item->id);
$this->assertEquals(1, $grade_item->grademin);
$this->assertEquals(1, $grade_item->grademax);
$status = $scale->is_used();
$this->assertTrue($status);
}
}

2
mod/forum/lib.php
View File

@ -954,7 +954,7 @@ function forum_scale_used_anywhere(int $scaleid): bool {
return false;
}
return $DB->record_exists('forum', ['scale' => $scaleid * -1]);
return $DB->record_exists_select('forum', "scale = ? and assessed > 0", [$scaleid * -1]);
}
// SQL FUNCTIONS ///////////////////////////////////////////////////////////

2
mod/glossary/lib.php
View File

@ -877,7 +877,7 @@ function glossary_scale_used() {
function glossary_scale_used_anywhere($scaleid) {
global $DB;
if ($scaleid and $DB->record_exists('glossary', array('scale'=>-$scaleid))) {
if ($scaleid and $DB->record_exists_select('glossary', "scale = ? and assessed > 0", [-$scaleid])) {
return true;
} else {
return false;