L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-48383 task: Indicate when a task will not run if plugin is disabled

Browse Source
This commit is contained in:
Frederic Massart
2015-01-22 11:08:10 +08:00
parent 2ea6a2b161
commit 737a5f7fe4
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/task/cli/schedule_task.php
+7 -2
View File
@@ -72,8 +72,13 @@ if ($options['list']) {
. $task->get_day_of_week();
$nextrun = $task->get_next_run_time();
if ($task->get_disabled()) {
$nextrun = get_string('disabled', 'tool_task');
$plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
$plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
if ($plugindisabled) {
$nextrun = get_string('plugindisabled', 'tool_task');
} else if ($task->get_disabled()) {
$nextrun = get_string('taskdisabled', 'tool_task');
} else if ($nextrun > time()) {
$nextrun = userdate($nextrun);
} else {