Fixes silverstripe#55: Ensure correct controller is used to render ch…

…eckExport (silverstripe#56) * Ensure correct controller is used to render checkExport * Remove branch alias Co-authored-by: Robbie Averill <[email protected]>
creative-commoners · Jan 9, 2022 · 35a6b59 · 35a6b59
1 parent 4efbdce
commit 35a6b59
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Forms/GridFieldQueuedExportButton.php b/src/Forms/GridFieldQueuedExportButton.php
@@ -12,6 +12,7 @@
 use SilverStripe\Forms\GridField\GridField_FormAction;
 use SilverStripe\Forms\GridField\GridField_HTMLProvider;
 use SilverStripe\Forms\GridField\GridField_URLHandler;
+use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\Security\Security;
 use SilverStripe\View\ArrayData;
@@ -227,6 +228,9 @@ public function checkExport($gridField, $request = null)
         if ($request->isAjax()) {
             return $return;
         } else {
+            while ($controller && $controller instanceof GridFieldDetailForm_ItemRequest) {
+                $controller = $controller->getController();
+            }
             return $controller->customise(['Content' => $return]);
         }
     }