Revert "Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE"

This reverts commit d6eb354664, reversing
changes made to 93b2d3baca.
This commit is contained in:
Marina Glancy 2014-04-29 17:29:01 +08:00
parent a632d590f3
commit cb5260014a
2 changed files with 1 additions and 18 deletions

View file

@ -1744,10 +1744,7 @@ class core_course_courselib_testcase extends advanced_testcase {
array( array(
'objectid' => $section->id, 'objectid' => $section->id,
'courseid' => $course->id, 'courseid' => $course->id,
'context' => context_course::instance($course->id), 'context' => context_course::instance($course->id)
'other' => array(
'sectionnum' => $section->section
)
) )
); );
$event->add_record_snapshot('course_sections', $section); $event->add_record_snapshot('course_sections', $section);
@ -1764,7 +1761,6 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertEquals($section->id, $event->objectid); $this->assertEquals($section->id, $event->objectid);
$this->assertEquals($course->id, $event->courseid); $this->assertEquals($course->id, $event->courseid);
$this->assertEquals($coursecontext->id, $event->contextid); $this->assertEquals($coursecontext->id, $event->contextid);
$this->assertEquals($section->section, $event->other['sectionnum']);
$expecteddesc = 'Course ' . $event->courseid . ' section ' . $event->other['sectionnum'] . ' updated by user ' . $event->userid; $expecteddesc = 'Course ' . $event->courseid . ' section ' . $event->other['sectionnum'] . ' updated by user ' . $event->userid;
$this->assertEquals($expecteddesc, $event->get_description()); $this->assertEquals($expecteddesc, $event->get_description());
$this->assertEquals($section, $event->get_record_snapshot('course_sections', $event->objectid)); $this->assertEquals($section, $event->get_record_snapshot('course_sections', $event->objectid));

View file

@ -83,17 +83,4 @@ class course_section_updated extends base {
$sectiondata = $this->get_record_snapshot('course_sections', $this->objectid); $sectiondata = $this->get_record_snapshot('course_sections', $this->objectid);
return array($this->courseid, 'course', 'editsection', 'editsection.php?id=' . $this->objectid, $sectiondata->section); return array($this->courseid, 'course', 'editsection', 'editsection.php?id=' . $this->objectid, $sectiondata->section);
} }
/**
* Custom validation.
*
* @throws \coding_exception
* @return void
*/
protected function validate_data() {
parent::validate_data();
if (!isset($this->other['sectionnum'])) {
throw new \coding_exception('The sectionnum must be set in $other');
}
}
} }