Merge pull request #53 from systopia/redirect-to-funding-case

Redirect to funding case after adding an application
systopia · May 24, 2024 · e17347a · e17347a
2 parents 0b71b8e + ebf54d8
commit e17347a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Controller/FundingCaseController.php b/src/Controller/FundingCaseController.php
@@ -24,6 +24,7 @@
 use Drupal\civiremote_funding\Form\FundingCaseForm;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Url;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -43,7 +44,7 @@ public function __construct(FundingApi $fundingApi) {
   /**
    * @return array<int|string, mixed>
    */
-  public function content(int $fundingCaseId): array {
+  public function content(Request $request, int $fundingCaseId): array {
     $fundingCase = $this->fundingApi->getFundingCase($fundingCaseId);
     if (NULL === $fundingCase) {
       throw new NotFoundHttpException();
@@ -74,7 +75,11 @@ public function content(int $fundingCaseId): array {
             ['@type' => $fundingCaseType->getApplicationProcessLabel()]
           ),
         ],
-        '#url' => Url::fromRoute('civiremote_funding.case_application_add', ['fundingCaseId' => $fundingCaseId]),
+        '#url' => Url::fromRoute(
+          'civiremote_funding.case_application_add',
+          ['fundingCaseId' => $fundingCaseId],
+          ['query' => ['destination' => $request->getRequestUri()]]
+        ),
       ];
     }