MDL-45257 mod_assign: Removing wonky feedback_updated event

diff --git a/mod/assign/classes/event/feedback_updated.php b/mod/assign/classes/event/feedback_updated.php
deleted file mode 100644 (file)
index 2bab6fe..0000000
--- a/mod/assign/classes/event/feedback_updated.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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/>.
-
-/**
- * The mod_assign feedback updated event.
- *
- * @package    mod_assign
- * @copyright  2014 Mark Nelson <markn@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_assign\event;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_assign feedback updated event.
- *
- * @property-read array $other {
- *      Extra information about event.
- *
- *      - int assignid: the id of the assignment.
- * }
- *
- * @package    mod_assign
- * @since      Moodle 2.7
- * @copyright  2014 Mark Nelson <markn@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class feedback_updated extends base {
-    /**
-     * Create instance of event.
-     *
-     * @param \assign $assign
-     * @param \stdClass $grade
-     * @return feedback_updated
-     */
-    public static function create_from_grade(\assign $assign, \stdClass $grade) {
-        $data = array(
-            'objectid' => $grade->id,
-            'relateduserid' => $grade->userid,
-            'context' => $assign->get_context(),
-            'other' => array(
-                'assignid' => $assign->get_instance()->id,
-            ),
-        );
-        /** @var feedback_updated $event */
-        $event = self::create($data);
-        $event->set_assign($assign);
-        $event->add_record_snapshot('assign_grades', $grade);
-        return $event;
-    }
-
-    /**
-     * Init method.
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_TEACHING;
-    }
-
-    /**
-     * Returns localised general event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventfeedbackupdated', 'mod_assign');
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with the id {$this->userid} updated the feedback for the user with the id {$this->relateduserid}
-            for the assignment with the id {$this->other['assignid']}.";
-    }
-
-    /**
-     * Custom validation.
-     *
-     * @throws \coding_exception
-     */
-    protected function validate_data() {
-        parent::validate_data();
-
-        if (!isset($this->relateduserid)) {
-            throw new \coding_exception('The \'relateduserid\' must be set.');
-        }
-
-        if (!isset($this->other['assignid'])) {
-            throw new \coding_exception('The \'assignid\' must be set in other.');
-        }
-    }
-}

diff --git a/mod/assign/feedback/offline/locallib.php b/mod/assign/feedback/offline/locallib.php
index cc5c5d8..798fd3e 100644 (file)
--- a/mod/assign/feedback/offline/locallib.php
+++ b/mod/assign/feedback/offline/locallib.php
@@ -187,17 +187,7 @@ class assign_feedback_offline extends assign_feedback_plugin {
                         $updatecount += 1;
                         $grade = $this->assignment->get_user_grade($record->user->id, true);
                         $this->assignment->notify_grade_modified($grade);
-                        if ($plugin->set_editor_text($field, $newvalue, $grade->id)) {
-                            $logdesc = new lang_string('feedbackupdate', 'assignfeedback_offline',
-                                                  array('field'=>$description,
-                                                        'student'=>$userdesc,
-                                                        'text'=>$newvalue));
-
-                            // Trigger event for updating the feedback.
-                            $event = \mod_assign\event\feedback_updated::create_from_grade($this->assignment, $grade);
-                            $event->set_legacy_logdata('save grading feedback', $logdesc);
-                            $event->trigger();
-                        }
+                        $plugin->set_editor_text($field, $newvalue, $grade->id);
 
                         // If this is the gradebook comments plugin - post an update to the gradebook.
                         if (($plugin->get_subtype() . '_' . $plugin->get_type()) == $gradebookplugin) {

diff --git a/mod/assign/tests/events_test.php b/mod/assign/tests/events_test.php
index ac391b9..4c44002 100644 (file)
--- a/mod/assign/tests/events_test.php
+++ b/mod/assign/tests/events_test.php
@@ -648,40 +648,6 @@ class assign_events_testcase extends mod_assign_base_testcase {
         $this->assertEventContextNotUsed($event);
     }
 
-    /**
-     * Test the feedback_updated event.
-     */
-    public function test_feedback_updated() {
-        $assign = $this->create_instance();
-
-        $logdesc = get_string('feedbackupdate', 'assignfeedback_offline',
-            array('field' => 'The description',
-                  'student' => 'The student\'s name',
-                  'text' => 'Text'));
-        $event = \mod_assign\event\feedback_updated::create(array(
-            'userid' => 2,
-            'relateduserid' => 2,
-            'context' => $assign->get_context(),
-            'other' => array(
-                'assignid' => $assign->get_instance()->id
-            )
-        ));
-        $event->set_legacy_logdata('save grading feedback', $logdesc);
-
-        // Trigger and capture the event.
-        $sink = $this->redirectEvents();
-        $event->trigger();
-        $events = $sink->get_events();
-        $event = reset($events);
-
-        $this->assertInstanceOf('\mod_assign\event\feedback_updated', $event);
-        $this->assertEquals($assign->get_context(), $event->get_context());
-        $expectedlog = array($assign->get_course()->id, 'assign', 'save grading feedback', 'view.php?id=' . $assign->get_course_module()->id,
-            $logdesc, $assign->get_course_module()->id);
-        $this->assertEventLegacyLogData($expectedlog, $event);
-        $this->assertEventContextNotUsed($event);
-    }
-
     /**
      * Test the grading_form_viewed event.
      */