Fix action handling of workflowsettings

adminlib.php

@@ -462,14 +462,18 @@ class workflow_settings {
 
     /**
      * This is the entry point for this controller class.
+     * @param $action string action string to be executed.
+     * @param $subpluginid int id of the subplugin associated.
+     * @param $workflowid int id of the workflow associated.
+     * @throws \coding_exception
      */
-    public function execute($action, $subplugin) {
+    public function execute($action, $subpluginid, $workflowid) {
         $this->check_permissions();
 
         // Handle other actions.
-        step_manager::handle_action($action, $subplugin);
-        trigger_manager::handle_action($action, $subplugin);
-        workflow_manager::handle_action($action, $subplugin);
+        step_manager::handle_action($action, $subpluginid);
+        trigger_manager::handle_action($action, $subpluginid);
+        workflow_manager::handle_action($action, $workflowid);
 
         if ($action === action::TRIGGER_INSTANCE_FORM) {
             if ($this->handle_trigger_instance_form()) {

workflowsettings.php

@@ -41,9 +41,5 @@ if (!$workflow) {
 $workflowsettings = new tool_lifecycle\workflow_settings($workflowid);
 
 // Execute the controller.
-// @TODO what's the purpose of subplugin? why not workflowid?
-$subplugin = optional_param('subplugin', null, PARAM_INT);
-if ($subplugin == null && $workflowid) {
+$subpluginid = optional_param('subplugin', null, PARAM_INT);
+$workflowsettings->execute(optional_param('action', null, PARAM_TEXT), $subpluginid, $workflowid);
\ No newline at end of file
-    $subplugin = $workflowid;
-}
-$workflowsettings->execute(optional_param('action', null, PARAM_TEXT), $subplugin);
\ No newline at end of file