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

MDL-58502 mod_feedback: courseid is not course where feedback is

Browse Source
This commit is contained in:
Marina Glancy
2017-04-07 16:02:39 +08:00
parent bd99cb9021
commit f4dba1755c
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/classes/completion.php
+5 -13
View File
@@ -639,31 +639,23 @@ class mod_feedback_completion extends mod_feedback_structure {
/**
* Trigger module viewed event.
*
* @param stdClass $course optional, course object from DB
* @since Moodle 3.3
*/
public function trigger_module_viewed($course = null) {
if ($course == null) {
$course = get_course($this->courseid);
}
$event = \mod_feedback\event\course_module_viewed::create_from_record($this->feedback, $this->cm, $course);
public function trigger_module_viewed() {
$event = \mod_feedback\event\course_module_viewed::create_from_record($this->feedback, $this->cm, $this->cm->get_course());
$event->trigger();
}
/**
* Mark activity viewed for completion-tracking.
*
* @param stdClass $course optional, course object from DB
* @since Moodle 3.3
*/
public function set_module_viewed($course = null) {
public function set_module_viewed() {
global $CFG;
require_once($CFG->libdir . '/completionlib.php');
if ($course == null) {
$course = get_course($this->courseid);
}
$completion = new completion_info($course);
$completion = new completion_info($this->cm->get_course());
$completion->set_module_viewed($this->cm);
}
@@ -688,7 +680,7 @@ class mod_feedback_completion extends mod_feedback_structure {
if ($this->form->is_cancelled()) {
// Form was cancelled - return to the course page.
$urltogo = course_get_url($this->courseid);
$urltogo = course_get_url($this->courseid ?: $this->feedback->course);
} else if ($this->form->is_submitted() &&
($this->form->is_validated() || $gopreviouspage)) {
// Form was submitted (skip validation for "Previous page" button).