MDL-40912 coursecat: replaced 'update' add_to_log call with an event

This commit is contained in:
Mark Nelson 2013-12-30 16:47:57 -08:00
parent 03ea10e6d3
commit c4cea8cb5d
4 changed files with 99 additions and 2 deletions

View file

@ -717,6 +717,7 @@ $string['eventcommentdeleted'] = 'Comment deleted';
$string['eventcommentsviewed'] = 'Comments viewed'; $string['eventcommentsviewed'] = 'Comments viewed';
$string['eventcoursecategorycreated'] = 'Category created'; $string['eventcoursecategorycreated'] = 'Category created';
$string['eventcoursecategorydeleted'] = 'Category deleted'; $string['eventcoursecategorydeleted'] = 'Category deleted';
$string['eventcoursecategoryupdated'] = 'Category updated';
$string['eventcoursecontentdeleted'] = 'Course content deleted'; $string['eventcoursecontentdeleted'] = 'Course content deleted';
$string['eventcoursecreated'] = 'Course created'; $string['eventcoursecreated'] = 'Course created';
$string['eventcoursedeleted'] = 'Course deleted'; $string['eventcoursedeleted'] = 'Course deleted';

View file

@ -0,0 +1,66 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
* Course category updated event.
*
* @package core
* @copyright 2014 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class course_category_updated extends base {
/**
* Initialise the event data.
*/
protected function init() {
$this->data['objecttable'] = 'course_categories';
$this->data['crud'] = 'u';
$this->data['level'] = self::LEVEL_OTHER;
}
/**
* Returns localised general event name.
*
* @return string
*/
public static function get_name() {
return get_string('eventcoursecategoryupdated');
}
/**
* Returns non-localised description of what happened.
*
* @return string
*/
public function get_description() {
return 'The course category with the id ' . $this->objectid . ' was updated by the user with the id ' .
$this->userid;
}
/**
* Return legacy data for add_to_log().
*
* @return array
*/
protected function get_legacy_logdata() {
return array(SITEID, 'category', 'update', 'editcategory.php?id=' . $this->objectid, $this->objectid);
}
}

View file

@ -521,13 +521,19 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate {
$newcategory->timemodified = time(); $newcategory->timemodified = time();
if ($editoroptions) {
$categorycontext = $this->get_context(); $categorycontext = $this->get_context();
if ($editoroptions) {
$newcategory = file_postupdate_standard_editor($newcategory, 'description', $editoroptions, $categorycontext, $newcategory = file_postupdate_standard_editor($newcategory, 'description', $editoroptions, $categorycontext,
'coursecat', 'description', 0); 'coursecat', 'description', 0);
} }
$DB->update_record('course_categories', $newcategory); $DB->update_record('course_categories', $newcategory);
add_to_log(SITEID, "category", 'update', "editcategory.php?id=$this->id", $this->id);
$event = \core\event\course_category_updated::create(array(
'objectid' => $newcategory->id,
'context' => $categorycontext
));
$event->trigger();
fix_course_sortorder(); fix_course_sortorder();
// Purge cache even if fix_course_sortorder() did not do it. // Purge cache even if fix_course_sortorder() did not do it.
cache_helper::purge_by_event('changesincoursecat'); cache_helper::purge_by_event('changesincoursecat');

View file

@ -52,4 +52,28 @@ class core_events_testcase extends advanced_testcase {
$expected = array(SITEID, 'category', 'add', 'editcategory.php?id=' . $category->id, $category->id); $expected = array(SITEID, 'category', 'add', 'editcategory.php?id=' . $category->id, $category->id);
$this->assertEventLegacyLogData($expected, $event); $this->assertEventLegacyLogData($expected, $event);
} }
/**
* Test the course category updated event.
*/
public function test_course_category_updated() {
// Create a category.
$category = $this->getDataGenerator()->create_category();
// Create some data we are going to use to update this category.
$data = new stdClass();
$data->name = 'Category name change';
// Trigger and capture the event.
$sink = $this->redirectEvents();
$category->update($data);
$events = $sink->get_events();
$event = reset($events);
// Check that the event data is valid.
$this->assertInstanceOf('\core\event\course_category_updated', $event);
$this->assertEquals(context_coursecat::instance($category->id), $event->get_context());
$expected = array(SITEID, 'category', 'update', 'editcategory.php?id=' . $category->id, $category->id);
$this->assertEventLegacyLogData($expected, $event);
}
} }