Skip to content
Snippets Groups Projects

Issue #3421250 by mably: fix invalid colspan for details in taskconsole controller

Merged Frank Mably requested to merge issue/maestro-3421250:3421250-invalid-colspan-in into 3.x
1 file
+ 11
11
Compare changes
  • Side-by-side
  • Inline
@@ -100,7 +100,7 @@ class MaestroTaskConsoleController extends ControllerBase {
else {
$query_options = ['queueid_or_token' => $queueID];
}
if (array_key_exists('data', $taskTemplate) && array_key_exists('modal', $taskTemplate['data']) && $taskTemplate['data']['modal'] == 'modal') {
$use_modal = TRUE;
@@ -129,7 +129,7 @@ class MaestroTaskConsoleController extends ControllerBase {
$query_options += $handler_url_parts['query'];
// Let's call a hook here to let people change the name of the link to execute the task if they so choose to do so.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
[&$link, $taskTemplate, $queueRecord, $templateMachineName]
);
@@ -157,12 +157,12 @@ class MaestroTaskConsoleController extends ControllerBase {
case 'internal':
// Let's call a hook here to let people change the name of the link to execute the task if they so choose to do so.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
[&$link, $taskTemplate, $queueRecord, $templateMachineName]
);
// Let's call a hook here to let people change the actual link.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_url_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_url_alter',
[&$handler, &$query_options, $taskTemplate, $queueRecord, $templateMachineName, 'internal']
);
@@ -178,17 +178,17 @@ class MaestroTaskConsoleController extends ControllerBase {
],
];
break;
case 'function':
// Let's call a hook here to let people change the name of the link to execute the task if they so choose to do so.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_link_alter',
[&$link, $taskTemplate, $queueRecord, $templateMachineName]
);
// Let's call a hook here to let people change the actual link.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_url_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_interactive_url_alter',
[&$handler, &$query_options, $taskTemplate, $queueRecord, $templateMachineName, 'function']
);
@@ -232,7 +232,7 @@ class MaestroTaskConsoleController extends ControllerBase {
/*
* Provide your own execution links here if you wish
*/
\Drupal::moduleHandler()->invokeAll('maestro_task_console_alter_execution_link',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_alter_execution_link',
[&$build['task_console_table'][$queueID]['execute'], $taskTemplate, $queueRecord, $templateMachineName]
);
@@ -270,7 +270,7 @@ class MaestroTaskConsoleController extends ControllerBase {
$build['task_console_table'][$queueID . '_ajax']['#attributes']['id'] = $queueID . '_ajax';
$build['task_console_table'][$queueID . '_ajax']['#attributes']['class'] = ['maestro-ajax-row'];
$build['task_console_table'][$queueID . '_ajax']['task'] = [
'#wrapper_attributes' => ['colspan' => count($build['task_console_table'][$queueID])],
'#wrapper_attributes' => ['colspan' => count($build['task_console_table'][$queueID]) - 1],
'#prefix' => '<div id="maestro-ajax-' . $queueID . '">',
'#suffix' => '</div>',
];
@@ -310,7 +310,7 @@ class MaestroTaskConsoleController extends ControllerBase {
if (isset($template->show_details) && $template->show_details) {
// We provide an invokation here to allow other modules to inject their own
// custom information into the task display.
\Drupal::moduleHandler()->invokeAll('maestro_task_console_custominformation_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_custominformation_alter',
[&$customInformation, $taskTemplate, $queueRecord, $templateMachineName]
);
@@ -338,7 +338,7 @@ class MaestroTaskConsoleController extends ControllerBase {
}
// Anyone want to override the task details display?
\Drupal::moduleHandler()->invokeAll('maestro_task_console_taskdetails_alter',
\Drupal::moduleHandler()->invokeAll('maestro_task_console_taskdetails_alter',
[&$taskDetails, $taskTemplate, $queueRecord, $templateMachineName]
);
Loading