MDL-39954 event: Fixed errors raised while triggering event

diff --git a/mod/assignment/type/upload/classes/event/assessable_submitted.php b/mod/assignment/type/upload/classes/event/assessable_submitted.php
index a8ba56d..2547c8f 100644 (file)
--- a/mod/assignment/type/upload/classes/event/assessable_submitted.php
+++ b/mod/assignment/type/upload/classes/event/assessable_submitted.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace assignment_submitted\event;
+namespace assignment_upload\event;
 
 defined('MOODLE_INTERNAL') || die();
 

diff --git a/mod/assignment/type/upload/classes/event/assessable_uploaded.php b/mod/assignment/type/upload/classes/event/assessable_uploaded.php
index ff7f832..de6fecc 100644 (file)
--- a/mod/assignment/type/upload/classes/event/assessable_uploaded.php
+++ b/mod/assignment/type/upload/classes/event/assessable_uploaded.php
@@ -63,8 +63,8 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
         $eventdata->itemid       = $this->objectid;
         $eventdata->courseid     = $this->courseid;
         $eventdata->userid       = $this->userid;
-        if ($this->get_legacy_files()) {
-            $eventdata->files    = $this->get_legacy_files(); // This is depreceated - please use pathnamehashes instead!
+        if ($this->legacyfiles) {
+            $eventdata->files    = $this->legacyfiles; // This is depreceated - please use pathnamehashes instead!
         }
         $eventdata->pathnamehashes = $this->other['pathnamehashes'];
         return $eventdata;
@@ -127,16 +127,4 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
         $this->legacyfiles = $files;
     }
 
-    /**
-     * Custom validation
-     *
-     * @throws coding_exception
-     * @return void
-     */
-    protected function validate_data() {
-        parent::validate_data();
-        if (!isset($this->other['triggeredfrom'])) {
-            throw new coding_exception('triggeredfrom must be set in $other');
-        }
-    }
 }

diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index 183889c..2b1c1e7 100644 (file)
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -218,7 +218,7 @@ if ($edit) {
             'objectid' => $submission->id,
             'other' => array(
                 'content' => $formdata->content,
-                'files' => array_keys($files)
+                'pathnamehashes' => array_keys($files)
             )
         );
         $event = \mod_workshop\event\assessable_uploaded::create($params);