Merge pull request #890 from tractorcow-farm/7

Merge branch '7' into 8

src/Extension/Traits/FluentObjectTrait.php

@@ -11,6 +11,7 @@
 use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldConfig_Base;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
+use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataQuery;
@@ -106,6 +107,8 @@ protected function updateFluentCMSFields(FieldList $fields)
 
         // Generate gridfield for handling localisations
         $config = GridFieldConfig_Base::create();
+        // Remove filters as the displayed data is in ArrayList format
+        $config->removeComponentsByType(GridFieldFilterHeader::class);
 
         $columns = $config->getComponentByType(GridFieldDataColumns::class);
         $summaryColumns = [

src/Task/ConvertTranslatableTask.php

@@ -6,6 +6,7 @@
 use SilverStripe\Core\Convert;
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\Dev\Debug;
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\Queries\SQLSelect;
@@ -31,6 +32,8 @@
  * 3. Log into the CMS and set up the locales you want to use
  * 4. Back up your DB again
  * 5. Log into the CMS and check everything
+ *
+ * @deprecated 7.3.0 Will be removed without equivalent functionality to replace it
  */
 class ConvertTranslatableTask extends BuildTask
 {
@@ -40,6 +43,18 @@ class ConvertTranslatableTask extends BuildTask
 
     private static $segment = 'ConvertTranslatableTask';
 
+    public function __construct()
+    {
+        parent::__construct();
+        Deprecation::withSuppressedWarning(function () {
+            Deprecation::notice(
+                '7.3.0',
+                'Will be removed without equivalent functionality to replace it',
+                Deprecation::SCOPE_CLASS
+            );
+        });
+    }
+
     /**
      * Checks that fluent is configured correctly
      *

src/Task/ConvertTranslatableTask/Exception.php

@@ -2,7 +2,22 @@
 
 namespace TractorCow\Fluent\Task\ConvertTranslatableTask;
 
+use SilverStripe\Dev\Deprecation;
+
+/**
+ * @deprecated 7.3.0 Will be removed without equivalent functionality to replace it
+ */
 class Exception extends \Exception
 {
-
+    public function __construct()
+    {
+        parent::__construct();
+        Deprecation::withSuppressedWarning(function () {
+            Deprecation::notice(
+                '7.3.0',
+                'Will be removed without equivalent functionality to replace it',
+                Deprecation::SCOPE_CLASS
+            );
+        });
+    }
 }