Skip to content

Commit d10b2b0

Browse files
author
Dominic Tubach
committed
Drawdown tasks
1 parent 0625629 commit d10b2b0

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

Civi/Funding/Api4/Action/FundingTask/GetAction.php

+4
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ protected function handleRecord(array &$record): bool {
128128
return TRUE;
129129
}
130130

131+
if (!isset($record['funding_case_task.funding_case_id'])) {
132+
return FALSE;
133+
}
134+
131135
// @phpstan-ignore argument.type
132136
$fundingCase = $this->getFundingCaseManager()->get($record['funding_case_task.funding_case_id']);
133137
if (NULL === $fundingCase) {

Civi/Funding/DependencyInjection/Compiler/FundingTaskPass.php

+8
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222
use Civi\Funding\DependencyInjection\Compiler\Traits\TaggedFundingCaseTypeServicesTrait;
2323
use Civi\Funding\Task\Creator\ApplicationProcessTaskCreatorInterface;
2424
use Civi\Funding\Task\Creator\ClearingProcessTaskCreatorInterface;
25+
use Civi\Funding\Task\Creator\DrawdownTaskCreatorInterface;
2526
use Civi\Funding\Task\Creator\FundingCaseTaskCreatorInterface;
2627
use Civi\Funding\Task\EventSubscriber\ApplicationProcessTaskSubscriber;
2728
use Civi\Funding\Task\EventSubscriber\ClearingProcessTaskSubscriber;
29+
use Civi\Funding\Task\EventSubscriber\DrawdownTaskSubscriber;
2830
use Civi\Funding\Task\EventSubscriber\FundingCaseTaskSubscriber;
2931
use Civi\Funding\Task\Modifier\ApplicationProcessTaskModifierInterface;
3032
use Civi\Funding\Task\Modifier\ClearingProcessTaskModifierInterface;
33+
use Civi\Funding\Task\Modifier\DrawdownTaskModifierInterface;
3134
use Civi\Funding\Task\Modifier\FundingCaseTaskModifierInterface;
3235
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
3336
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -79,6 +82,11 @@ private function getSubscriberSpecifications(): iterable {
7982
ClearingProcessTaskCreatorInterface::class,
8083
ClearingProcessTaskModifierInterface::class,
8184
];
85+
86+
yield DrawdownTaskSubscriber::class => [
87+
DrawdownTaskCreatorInterface::class,
88+
DrawdownTaskModifierInterface::class,
89+
];
8290
}
8391

8492
}

managed/SavedSearch_FundingTasks.mgd.php

+12-6
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,17 @@
7979
'size' => 'btn-xs',
8080
'links' => [
8181
[
82-
'path' => 'civicrm/a#funding/case/[source_record_id]',
82+
'path' => 'civicrm/a#funding/case/[funding_case_task.funding_case_id]',
8383
'icon' => 'fa-folder-open-o',
8484
'text' => E::ts('Open funding case'),
8585
'style' => 'default',
8686
'condition' => [
8787
'activity_type_id:name',
88-
'=',
89-
'funding_case_task',
88+
'IN',
89+
[
90+
'funding_case_task',
91+
'funding_drawdown_task',
92+
],
9093
],
9194
'task' => '',
9295
'entity' => '',
@@ -96,7 +99,7 @@
9699
],
97100
[
98101
'path' => 'civicrm/a#funding/application/[source_record_id]',
99-
'icon' => 'fa-external-link',
102+
'icon' => 'fa-folder-open-o',
100103
'text' => E::ts('Open application'),
101104
'style' => 'default',
102105
'condition' => [
@@ -112,7 +115,7 @@
112115
],
113116
[
114117
'path' => 'civicrm/a#funding/clearing/[source_record_id]',
115-
'icon' => 'fa-external-link',
118+
'icon' => 'fa-folder-open-o',
116119
'text' => E::ts('Open clearing'),
117120
'style' => 'default',
118121
'condition' => [
@@ -131,11 +134,14 @@
131134
'alignment' => 'text-right',
132135
],
133136
],
134-
'actions' => TRUE,
137+
'actions' => [
138+
'download',
139+
],
135140
'classes' => [
136141
'table',
137142
'table-striped',
138143
],
144+
'actions_display_mode' => 'menu',
139145
],
140146
],
141147
'match' => [

0 commit comments

Comments
 (0)