Skip to content
Snippets Groups Projects
Commit 0c78454a authored by TamaraGunkel's avatar TamaraGunkel
Browse files

Fix assumptions of existing functions

parent 54ea58fc
No related branches found
No related tags found
No related merge requests found
......@@ -53,7 +53,7 @@ class cleanup_processor {
foreach ($activeworkflows as $workflow) {
$trigger = trigger_manager::get_trigger_for_workflow($workflow->id);
$lib = lib_manager::get_trigger_lib($trigger->subpluginname);
$response = $lib->check_course($course);
$response = $lib->check_course($course, $trigger->id);
if ($response == trigger_response::next()) {
continue;
}
......
......@@ -108,7 +108,7 @@ class process_manager {
} else {
try {
if (get_course($process->courseid)) {
debugging('Course should no longer exist!!!!');
debugging('Course exists, but shouldn\'t!!!!'); // TODO This plugin is not just for deleting anymore!
}
} catch (\dml_missing_record_exception $e) {
// Expected behaviour!
......
......@@ -24,6 +24,7 @@
namespace tool_cleanupcourses\manager;
defined('MOODLE_INTERNAL') || die();
require_once (__DIR__.'/../../lib.php');
class settings_manager {
......
......@@ -28,6 +28,7 @@ namespace tool_cleanupcourses\step;
use tool_cleanupcourses\entity\process;
use tool_cleanupcourses\entity\step_subplugin;
use tool_cleanupcourses\manager\process_data_manager;
use tool_cleanupcourses\manager\step_manager;
defined('MOODLE_INTERNAL') || die();
......@@ -57,7 +58,8 @@ class interactionemail extends interactionlibbase {
* @return array of action tools
*/
public function get_action_tools($process) {
$keep = process_data_manager::get_process_data($process->id, $process->stepid, EMAIL_PROCDATA_KEY_KEEP);
$step = step_manager::get_step_instance_by_workflow_index($process->workflowid, $process->stepindex);
$keep = process_data_manager::get_process_data($process->id, $step->id, EMAIL_PROCDATA_KEY_KEEP);
if ($keep === '1') {
return array();
}
......@@ -75,7 +77,8 @@ class interactionemail extends interactionlibbase {
* @return string status message
*/
public function get_status_message($process) {
$keep = process_data_manager::get_process_data($process->id, $process->stepid, EMAIL_PROCDATA_KEY_KEEP);
$step = step_manager::get_step_instance_by_workflow_index($process->workflowid, $process->stepindex);
$keep = process_data_manager::get_process_data($process->id, $step->id, EMAIL_PROCDATA_KEY_KEEP);
if ($keep === '1') {
return get_string('status_message_decision_keep', 'cleanupcoursesstep_email');
}
......
......@@ -30,6 +30,7 @@ use tool_cleanupcourses\response\trigger_response;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/../lib.php');
require_once(__DIR__ . '/../../lib.php');
/**
* Class which implements the basic methods necessary for a cleanyp courses trigger subplugin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment