Merge branch '3.0' into 3

silverstripe · Oct 31, 2023 · f1862d8 · f1862d8
2 parents 5e44b83 + 97c4521
commit f1862d8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/Forms/GridFieldExportReportButton.php b/src/Forms/GridFieldExportReportButton.php
@@ -60,7 +60,6 @@ public function generateExportFileData($gridField)
         // The is the only variation from the parent, using getList() instead of getManipulatedList()
         $items = $gridField->getList();
 
-        // @todo should GridFieldComponents change behaviour based on whether others are available in the config?
         foreach ($gridField->getConfig()->getComponents() as $component) {
             if ($component instanceof GridFieldFilterHeader || $component instanceof GridFieldSortableHeader) {
                 $items = $component->getManipulatedData($gridField, $items);

diff --git a/tests/php/UserSecurityReportTest.php b/tests/php/UserSecurityReportTest.php
@@ -42,7 +42,6 @@ class UserSecurityReportTest extends SapphireTest
      * Utility method for all tests to use.
      *
      * @return ArrayList
-     * @todo pre-fill the report with fixture-defined users
      */
     protected function setUp(): void
     {