diff --git a/README.md b/README.md index e9072a0..0887dcf 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ CatalogPage: #### Drag and drop sorting -You can add drag and drop sorting using GridFieldSortableRows when you add the `sort_column` setting to your configuration. +You can add drag and drop sorting using GridFieldOrderableRows when you add the `sort_column` setting to your configuration. Uses column `Sort` by default which is default in SiteTree and is added by CatalogDataObjectExtension. ```yml diff --git a/code/ModelAdmin/CatalogPageAdmin.php b/code/ModelAdmin/CatalogPageAdmin.php index 6048bd9..95feff1 100755 --- a/code/ModelAdmin/CatalogPageAdmin.php +++ b/code/ModelAdmin/CatalogPageAdmin.php @@ -25,6 +25,7 @@ public function init() */ public function getEditForm($id = null, $fields = null) { + /** @var DataObject|CatalogPageExtension|CatalogDataObjectExtension $model */ $model = singleton($this->modelClass); if ($model->has_extension('CatalogPageExtension') || $model->has_extension('CatalogDataObjectExtension')) { $list = $this->getList()->setDataQueryParam(array( @@ -66,8 +67,8 @@ public function getEditForm($id = null, $fields = null) $form->setAttribute('data-pjax-fragment', 'CurrentForm'); /** add sorting if we have a field for... */ - if (class_exists('GridFieldSortableRows') && $sortField = $model->getSortFieldname()) { - $fieldConfig->addComponent(new GridFieldSortableRows($sortField)); + if ($sortField = $model->getSortFieldname()) { + $fieldConfig->addComponent(new GridFieldOrderableRows($sortField)); } } elseif (method_exists($model, 'getAdminListField')) { $form = CMSForm::create( diff --git a/composer.json b/composer.json index ed73138..bc53ae5 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,9 @@ } ], "require": { - "undefinedoffset/sortablegridfield": "^0.6.0", + "php": "^7", + "symbiote/silverstripe-gridfieldextensions": "^2", "silverstripe/cms": "^3.4", "unclecheese/betterbuttons": "^1.3.7" - } }