Event condition and placeholders improved.

- PLS-731
- PLS-735

actions/notification/classes/actionform.php

@@ -219,6 +219,10 @@ public function delete_template_action($templateid) {
      */
     public function trigger_action($instancedata, $userid, $expectedtime=null, $newuser=false) {
 
+        if (!isset($instancedata->pulsenotification_id)) {
+            return false;
+        }
+
         $notification = notification::instance($instancedata->pulsenotification_id);
         $notificationinstance = (object) helper::filter_record_byprefix($instancedata, $this->config_shortname());
 

amd/src/module.js

@@ -145,16 +145,15 @@ define(['core_editor/events'], function() {
                     return false;
                 }
                 iframes.forEach((iframe) => {
-                    iframe.contentDocument.addEventListener('click', function(e) {
-                        var currentFrame = e.target;
+                    iframe.contentDocument.addEventListener('click', function() {
                         iframes.forEach((frame) => {
                             var frameElem = frame.contentDocument.querySelector(".insertatcaretactive");
                             if (frameElem !== null) {
                                 frameElem.classList.remove("insertatcaretactive");
                             }
                         });
 
-                        var contentBody = currentFrame.querySelector('body');
+                        var contentBody = iframe.contentDocument.querySelector('body');
                         if (contentBody !== null) {
                             contentBody.classList.add("insertatcaretactive");
                         }

classes/automation/condition_base.php

@@ -120,10 +120,11 @@ public function get_options() {
      * @param int $instanceid The instance ID.
      * @param int $userid The user ID.
      * @param mixed $expectedtime The expected time for triggering.
+     * @param bool $newuser Is the trigger instance for new user.
      */
-    public function trigger_instance(int $instanceid, int $userid, $expectedtime=null) {
+    public function trigger_instance(int $instanceid, int $userid, $expectedtime=null, $newuser=false) {
 
-        \mod_pulse\automation\instances::create($instanceid)->trigger_action($userid, $expectedtime);
+        \mod_pulse\automation\instances::create($instanceid)->trigger_action($userid, $expectedtime, $newuser);
     }
 
     /**
@@ -138,6 +139,15 @@ public function is_user_completed($notification, int $userid) {
         return true;
     }
 
+    /**
+     * Status of the condition addon works based on the user enrolment.
+     *
+     * @return bool
+     */
+    public function is_user_enrolment_based() {
+        return true;
+    }
+
     /**
      * Processes the saving of an instance.
      *
@@ -283,4 +293,14 @@ public function schedule_override_join() {
      */
     public function backup_define_structure(&$instances) {
     }
+
+    /**
+     * Delete the records of condition for the custom instance.
+     *
+     * @param int $instanceid
+     * @return void
+     */
+    public function delete_condition_instance(int $instanceid) {
+        return false;
+    }
 }