Fetch users list method improved

actions/notification/classes/notification.php

@@ -730,7 +730,7 @@ protected function get_users_withroles(array $roles, $context, $childuserid=null
         list($insql, $inparams) = $DB->get_in_or_equal($roles, SQL_PARAMS_NAMED, 'rle');
 
         // TODO: Define user fields, never get entire fields.
-        $rolesql = "SELECT u.*, ra.id, ra.roleid FROM {role_assignments} ra
+        $rolesql = "SELECT ra.id as assignid, u.*, ra.roleid FROM {role_assignments} ra
         JOIN {user} u ON u.id = ra.userid
         JOIN {role} r ON ra.roleid = r.id
         LEFT JOIN {role_names} rn ON (rn.contextid = :ctxid AND rn.roleid = r.id) ";

classes/automation/instances.php

@@ -447,6 +447,7 @@ public function find_user_completion_conditions($conditions, $instancedata, $use
             }
         }
 
+        // If one or more conditions are enabled then the result of completion condition should be same as enabled.
         return ($enabled == $result) ? true : false;
     }
 

classes/plugininfo/pulsecondition.php

@@ -89,31 +89,31 @@ public function load_settings(part_of_admin_tree $adminroot, $parentnodename, $h
      * @return array $subplugins.
      */
     public function get_plugins_list() {
-        $actionplugins = \core_component::get_plugin_list('pulsecondition');
-        return $actionplugins;
+        $conditionplugins = \core_component::get_plugin_list('pulsecondition');
+        return $conditionplugins;
     }
 
     /**
-     * Get the list of action plugins woithj its base class.
+     * Get the list of condition plugins with its base class instance.
      */
     public function get_plugins_base() {
         $plugins = $this->get_plugins_list();
 
         if (!empty($plugins)) {
             foreach ($plugins as $componentname => $pluginpath) {
                 $instance = $this->get_plugin($componentname);
-                $actions[$componentname] = $instance;
+                $conditions[$componentname] = $instance;
             }
         }
 
-        return $actions ?? [];
+        return $conditions ?? [];
     }
 
     /**
-     * Get the action component actionform instance.
+     * Get the condtion component actionform instance.
      *
      * @param string $componentname
-     * @return \actionform
+     * @return \conditionform
      */
     public function get_plugin($componentname) {
 
@@ -143,13 +143,13 @@ public static function instance() {
      * @return stdclass
      */
     public static function get_list() {
-        static $actionplugins = null;
+        static $conditionplugins = null;
 
-        if (!$actionplugins) {
-            $actionplugins = new self();
+        if (!$conditionplugins) {
+            $conditionplugins = new self();
         }
 
-        $plugins = $actionplugins->get_plugins_base();
+        $plugins = $conditionplugins->get_plugins_base();
         return $plugins;
     }
 }

version.php

@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_pulse';
-$plugin->version = 2023100704;
+$plugin->version = 2023100705;
 $plugin->requires = 2020061500; // Requires Moodle 3.90.
 $plugin->release = 'v2.0';
 $plugin->maturity = MATURITY_RC;