Merge branch '4.13' into 4

src/Forms/Form.php

@@ -1645,7 +1645,9 @@ class Form extends ViewableData implements HasRequestHandler
     public function defaultAction()
     {
         if ($this->hasDefaultAction && $this->actions) {
-            return $this->actions->first();
+            return $this->actions->flattenFields()->filterByCallback(function ($field) {
+                return $field instanceof FormAction;
+            })->first();
         }
         return null;
     }

src/Forms/GridField/GridFieldFilterHeader.php

@@ -6,6 +6,7 @@ use LogicException;
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPResponse;
+use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\Dev\Deprecation;
@@ -258,9 +259,13 @@ class GridFieldFilterHeader extends AbstractGridFieldComponent implements GridFi
             return false;
         }
         $modelClass = $gridField->getModelClass();
+        $singleton = singleton($modelClass);
+        if (ClassInfo::hasMethod($singleton, 'summaryFields')
+            && ClassInfo::hasMethod($singleton, 'searchableFields')
+        ) {
             // note: searchableFields() will return summary_fields if there are no searchable_fields on the model
-        $searchableFields = array_keys($modelClass::singleton()->searchableFields());
+            $searchableFields = array_keys($singleton->searchableFields());
-        $summaryFields = array_keys($modelClass::singleton()->summaryFields());
+            $summaryFields = array_keys($singleton->summaryFields());
             sort($searchableFields);
             sort($summaryFields);
             // searchable_fields has been explictily defined i.e. searchableFields() is not falling back to summary_fields
@@ -273,6 +278,18 @@ class GridFieldFilterHeader extends AbstractGridFieldComponent implements GridFi
                     return true;
                 }
             }
+        } else {
+            // Allows non-DataObject classes to be used with this component
+            $columns = $gridField->getColumns();
+            foreach ($columns as $columnField) {
+                $metadata = $gridField->getColumnMetadata($columnField);
+                $title = $metadata['title'];
+
+                if ($title && $list->canFilterBy($columnField)) {
+                    return true;
+                }
+            }
+        }
         return false;
     }
 

src/Forms/HTMLEditor/TinyMCEConfig.php

@@ -31,7 +31,7 @@ class TinyMCEConfig extends HTMLEditorConfig implements i18nEntityProvider
         'ar_EG' => 'ar',
         'ca_AD' => 'ca',
         'ca_ES' => 'ca',
-        'cs_CZ' => 'cs',
+        'cs_CZ' => 'cs_CZ',
         'cy_GB' => 'cy',
         'da_DK' => 'da',
         'da_GL' => 'da',

tests/php/Forms/FormTest.php

@@ -7,6 +7,7 @@ use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Dev\CSSContentParser;
 use SilverStripe\Dev\FunctionalTest;
+use SilverStripe\Forms\CompositeField;
 use SilverStripe\Forms\DateField;
 use SilverStripe\Forms\DatetimeField;
 use SilverStripe\Forms\FieldList;
@@ -23,7 +24,6 @@ use SilverStripe\Forms\Tests\FormTest\ControllerWithStrictPostCheck;
 use SilverStripe\Forms\Tests\FormTest\Player;
 use SilverStripe\Forms\Tests\FormTest\Team;
 use SilverStripe\Forms\Tests\FormTest\TestController;
-use SilverStripe\Forms\Tests\ValidatorTest\TestValidator;
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TimeField;
@@ -348,6 +348,23 @@ class FormTest extends FunctionalTest
         );
     }
 
+    public function testDefaultAction()
+    {
+        $form = Form::create(Controller::curr(), 'Form', new FieldList(), new FieldList(
+            new FormAction('doForm', 'Form Action')
+        ));
+        $this->assertNotNull($form->defaultAction());
+        $this->assertEquals('action_doForm', $form->defaultAction()->getName());
+
+        $form = Form::create(Controller::curr(), 'AnotherForm', new FieldList(), new FieldList(
+            new CompositeField(
+                new FormAction('doAnotherForm', 'Another Form Action')
+            )
+        ));
+        $this->assertNotNull($form->defaultAction());
+        $this->assertEquals('action_doAnotherForm', $form->defaultAction()->getName());
+    }
+
     public function testLoadDataFromIgnoreFalseish()
     {
         $form = new Form(

tests/php/Forms/GridField/GridFieldFilterHeaderTest.php

@@ -8,13 +8,16 @@ use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
 use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\Cheerleader;
 use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\CheerleaderHat;
 use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\Mom;
+use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\NonDataObject;
 use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\Team;
 use SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest\TeamGroup;
+use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 
@@ -208,4 +211,33 @@ class GridFieldFilterHeaderTest extends SapphireTest
         Config::modify()->set(Team::class, 'summary_fields', ['MySummaryField']);
         $this->assertFalse($filterHeader->canFilterAnyColumns($gridField));
     }
+
+    public function testCanFilterAnyColumnsNonDataObject()
+    {
+        $list = new ArrayList([
+            new NonDataObject([]),
+        ]);
+        $config = GridFieldConfig::create()->addComponent(new GridFieldFilterHeader());
+        $gridField = new GridField('testfield', 'testfield', $list, $config);
+        $form = new Form(null, 'Form', new FieldList([$gridField]), new FieldList());
+        /** @var GridFieldFilterHeader $component */
+        $component = $gridField->getConfig()->getComponentByType(GridFieldFilterHeader::class);
+
+        $this->assertFalse($component->canFilterAnyColumns($gridField));
+    }
+
+    public function testRenderHeadersNonDataObject()
+    {
+        $list = new ArrayList([
+            new NonDataObject([]),
+        ]);
+        $config = GridFieldConfig::create()->addComponent(new GridFieldFilterHeader());
+        $gridField = new GridField('testfield', 'testfield', $list, $config);
+        $form = new Form(null, 'Form', new FieldList([$gridField]), new FieldList());
+        /** @var GridFieldFilterHeader $component */
+        $component = $gridField->getConfig()->getComponentByType(GridFieldFilterHeader::class);
+        $htmlFragment = $component->getHTMLFragments($gridField);
+
+        $this->assertNull($htmlFragment);
+    }
 }

tests/php/Forms/GridField/GridFieldFilterHeaderTest/NonDataObject.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace SilverStripe\Forms\Tests\GridField\GridFieldFilterHeaderTest;
+
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\View\ArrayData;
+
+class NonDataObject extends ArrayData implements TestOnly
+{
+    public function summaryFields()
+    {
+        return ['Title' => 'Title'];
+    }
+}