Fix notifications for active workflows

adminlib.php

@@ -471,8 +471,8 @@ class workflow_settings {
         $this->check_permissions();
 
         // Handle other actions.
-        step_manager::handle_action($action, $subpluginid);
-        trigger_manager::handle_action($action, $subpluginid);
+        step_manager::handle_action($action, $subpluginid, $workflowid);
+        trigger_manager::handle_action($action, $subpluginid, $workflowid);
         workflow_manager::handle_action($action, $workflowid);
 
         if ($action === action::TRIGGER_INSTANCE_FORM) {

classes/manager/step_manager.php

@@ -217,10 +217,12 @@ class step_manager extends subplugin_manager {
      * Handles an action for a workflow step.
      * @param string $action action to be executed
      * @param int $subpluginid id of the step instance
+     * @param int $workflowid id of the workflow
      */
-    public static function handle_action($action, $subpluginid) {
-        if ($step = self::get_step_instance($subpluginid)) {
-            if (!workflow_manager::is_active($step->workflowid)) {
+    public static function handle_action($action, $subpluginid, $workflowid) {
+        $step = self::get_step_instance($subpluginid);
+        if ($step && $step->workflowid == $workflowid ) {
+            if (!workflow_manager::is_active($workflowid)) {
                 if ($action === action::UP_STEP) {
                     self::change_sortindex($subpluginid, true);
                 }

classes/manager/trigger_manager.php

@@ -240,11 +240,13 @@ class trigger_manager extends subplugin_manager {
     /**
      * Handles an action for a workflow step.
      * @param string $action action to be executed
-     * @param int $subpluginid id of the step instance
+     * @param int $subpluginid id of the trigger instance
+     * @param int $workflowid id of the workflow
      */
-    public static function handle_action($action, $subpluginid) {
-        if ($trigger = self::get_instance($subpluginid)) {
-            if (!workflow_manager::is_active($trigger->workflowid)) {
+    public static function handle_action($action, $subpluginid, $workflowid) {
+        $trigger = self::get_instance($subpluginid);
+        if ($trigger && $trigger->workflowid == $workflowid ) {
+            if (!workflow_manager::is_active($workflowid)) {
                 if ($action === action::UP_TRIGGER) {
                     self::change_sortindex($subpluginid, true);
                 }