Skip to content

Commit

Permalink
Applied Maestro And task patch
Browse files Browse the repository at this point in the history
  • Loading branch information
rimi-itk committed Jan 23, 2024
1 parent 03b9097 commit 02435b0
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 4 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@
"Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch"
},
"drupal/maestro": {
"Fix check for task notifications": "patches/drupal/maestro/maestro_notification.patch"
"Fix check for task notifications": "patches/drupal/maestro/maestro_notification.patch",
"Fix task pointers query": "patches/drupal/maestro/and-task.patch"
}
},
"patches-ignore": {
Expand Down
29 changes: 26 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions patches/drupal/maestro/and-task.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/src/Plugin/EngineTasks/MaestroAndTask.php b/src/Plugin/EngineTasks/MaestroAndTask.php
index 2d27bbe..bbdc5ff 100644
--- a/src/Plugin/EngineTasks/MaestroAndTask.php
+++ b/src/Plugin/EngineTasks/MaestroAndTask.php
@@ -94,12 +94,10 @@ class MaestroAndTask extends PluginBase implements MaestroEngineTaskInterface {
->condition('archived', '2', '!=')
->condition('process_id', $this->processID);

- $orConditionGroup = $query->orConditionGroup();
- foreach ($pointers as $taskID) {
- $orConditionGroup->condition('task_id', $taskID);
+ if (!empty($pointers)) {
+ $andMainConditions->condition('task_id', $pointers, 'IN');
}

- $andMainConditions->condition($orConditionGroup);
$query->condition($andMainConditions);

$queueIdCount = $query->count()->execute();

0 comments on commit 02435b0

Please sign in to comment.