From 3a34659252310875d5e71e6a6a345bd9a2598b57 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 15 May 2014 15:00:03 +0800 Subject: [PATCH 1/2] MDL-45323 grade: Fix query errors on grade_get_grade_for_activity method. --- grade/querylib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grade/querylib.php b/grade/querylib.php index 43ba59690dd..b45dc2458e3 100644 --- a/grade/querylib.php +++ b/grade/querylib.php @@ -251,9 +251,9 @@ function grade_get_grade_items_for_activity($cm, $only_main_item=false) { if (!isset($cm->modname)) { $params = array($cm->id); - $cm = $DB->get_record_sql("SELECT cm.*, m.name, md.name as modname + $cm = $DB->get_record_sql("SELECT cm.*, md.name as modname FROM {course_modules} cm, - {modules} md, + {modules} md WHERE cm.id = ? AND md.id = cm.module", $params); } From 1468444f421ec0cbc7222fbe70881c70ea02ed01 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 15 May 2014 15:00:56 +0800 Subject: [PATCH 2/2] MDL-45323 grade: Unit test for grade_get_grade_items_for_activity() --- grade/tests/querylib_test.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/grade/tests/querylib_test.php b/grade/tests/querylib_test.php index dca1a9ee786..c284123d8cf 100644 --- a/grade/tests/querylib_test.php +++ b/grade/tests/querylib_test.php @@ -50,4 +50,15 @@ class core_grade_querylib_testcase extends advanced_testcase { $this->assertEquals(1, count($cms)); $this->assertTrue(isset($cms[$forum1->cmid])); } + + public function test_grade_get_grade_items_for_activity() { + $this->resetAfterTest(true); + + $course = $this->getDataGenerator()->create_course(); + $forum = $this->getDataGenerator()->create_module('forum', array('course'=>$course->id)); + $cm = get_coursemodule_from_id('forum', $forum->cmid, $forum->course); + unset($cm->modname); + $grade = grade_get_grade_items_for_activity($cm); + + } }