Merge pull request #25 from chrometoasters/feature/remove_custom_Grid…

…FieldOrderableRows Replace a workaround class GridFieldOrderableRow with its origin class
chrometoasters · Aug 3, 2020 · 42b26d6 · 42b26d6
2 parents 5a24e84 + bdf5520
commit 42b26d6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 103 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
   "require": {
     "silverstripe/admin": "^1",
     "silverstripe/framework": "^4",
-    "silverstripe/vendor-plugin": "^1"
+    "silverstripe/vendor-plugin": "^1",
+    "symbiote/silverstripe-gridfieldextensions": "^3.2.3"
   },
   "extra": {
     "expose": [

diff --git a/src/Forms/FieldsProvider.php b/src/Forms/FieldsProvider.php
@@ -12,6 +12,7 @@
 use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\ORM\DataList;
 use SilverStripe\Versioned\GridFieldArchiveAction;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 
 /**
  * Class FieldsProvider

diff --git a/src/Forms/GridFieldOrderableRows.php b/src/Forms/GridFieldOrderableRows.php
diff --git a/src/ModelAdmins/TaxonomyModelAdmin.php b/src/ModelAdmins/TaxonomyModelAdmin.php
@@ -2,13 +2,13 @@
 
 namespace Chrometoaster\AdvancedTaxonomies\ModelAdmins;
 
-use Chrometoaster\AdvancedTaxonomies\Forms\GridFieldOrderableRows;
 use Chrometoaster\AdvancedTaxonomies\Models\TaxonomyTerm;
 use SilverStripe\Admin\ModelAdmin;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
 use SilverStripe\ORM\SS_List;
 use SilverStripe\View\Requirements;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
 
 /**

diff --git a/src/Models/TaxonomyTerm.php b/src/Models/TaxonomyTerm.php
@@ -3,7 +3,6 @@
 namespace Chrometoaster\AdvancedTaxonomies\Models;
 
 use Chrometoaster\AdvancedTaxonomies\Forms\GridFieldAddTagsAutocompleter;
-use Chrometoaster\AdvancedTaxonomies\Forms\GridFieldOrderableRows;
 use Chrometoaster\AdvancedTaxonomies\Generators\PluralGenerator;
 use Chrometoaster\AdvancedTaxonomies\Generators\URLSegmentGenerator;
 use Chrometoaster\AdvancedTaxonomies\ModelAdmins\TaxonomyModelAdmin;
@@ -38,6 +37,7 @@
 use SilverStripe\Versioned\GridFieldArchiveAction;
 use SilverStripe\View\ArrayData;
 use SilverStripe\View\ViewableData;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
 
 /**