Skip to content

Commit e43d3d4

Browse files
committed
forward category id not object to crontask
1 parent 50e453e commit e43d3d4

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

classes/task/evasys_bulk_task.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ public function execute()
1010
{
1111
$data = $this->get_custom_data();
1212
$courses = $data->courses;
13-
$evasyscategory = $data->evasyscategory;
14-
if(empty($evasyscategory) || empty($courses)){
13+
$categoryid = $data->categoryid;
14+
if(empty($categoryid) || empty($courses)){
1515
mtrace("No category or courses specified, exiting.");
1616
}
17+
$evasyscategory = \block_evasys_sync\evasys_category::for_category($categoryid);
1718
$errors = \block_evasys_sync\evaluation_manager::set_default_evaluation_for($courses, $evasyscategory);
1819
if ($errors) {
1920
$erroroutput = '';

managecategory_remaining.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
require_sesskey();
5353
$courses = required_param_array('ids', PARAM_INT);
5454
$queuedtasks = \core\task\manager::get_adhoc_tasks(evasys_bulk_task::class);
55-
$tasksofcurrentmodule = array_filter($queuedtasks, fn($task) => $task->get_custom_data()->evasyscategory === $evasyscategory);
55+
$tasksofcurrentmodule = array_filter($queuedtasks, fn($task) => $task->get_custom_data()->categoryid === $id);
5656
if(empty($tasksofcurrentmodule)){
5757
$task = new evasys_bulk_task();
5858
$data = new stdClass();
5959
$data->courses = $courses;
60-
$data->evasyscategory = $evasyscategory;
60+
$data->categoryid = $id;
6161
$task->set_custom_data($data);
6262
$task->set_userid($USER->id);
6363
\core\task\manager::queue_adhoc_task($task, true);
@@ -79,7 +79,7 @@
7979
$catids = array_merge($category->get_all_children_ids(), [$category->id]);
8080

8181
$queuedtasks = \core\task\manager::get_adhoc_tasks(evasys_bulk_task::class);
82-
$tasksofcurrentmodule = array_filter($queuedtasks, fn($task) => $task->get_custom_data()->evasyscategory === $evasyscategory);
82+
$tasksofcurrentmodule = array_filter($queuedtasks, fn($task) => $task->get_custom_data()->categoryid === $id);
8383

8484
$table = new remaining_courses_table($catids, $data->semester ?? null, $evasyscategory, $data->coursename ?? null, empty($tasksofcurrentmodule));
8585
$table->define_baseurl($PAGE->url);

0 commit comments

Comments
 (0)