client/src/js/GridField.js

@@ -8,7 +8,7 @@
         const gridField = this.getGridField();
         const state = gridField.getState().GridFieldSiteTreeAddNewButton;
 
-        state.pageType = this.val();
+        state.recordType = this.val();
         gridField.setState('GridFieldSiteTreeAddNewButton', state);
       }
     });

src/Forms/GridFieldSiteTreeAddNewButton.php

@@ -68,22 +68,22 @@ public function getHTMLFragments($gridField)
     {
         $state = $gridField->State->GridFieldSiteTreeAddNewButton;
 
-        $parent = SiteTree::get()->byId(Controller::curr()->currentPageID());
+        $parent = SiteTree::get()->byId(Controller::curr()->currentRecordID());
 
         if ($parent) {
-            $state->currentPageID = $parent->ID;
+            $state->currentRecordID = $parent->ID;
         }
 
         $children = $this->getAllowedChildren($parent);
         if (empty($children)) {
             return array();
         } elseif (count($children ?? []) > 1) {
-            $pageTypes = DropdownField::create('PageType', 'Page Type', $children, $parent->defaultChild());
+            $pageTypes = DropdownField::create('RecordType', 'Page Type', $children, $parent->defaultChild());
             $pageTypes
                 ->setFieldHolderTemplate(__CLASS__ . '_holder')
                 ->addExtraClass('gridfield-dropdown no-change-track');
 
-            $state->pageType = $parent->defaultChild();
+            $state->RecordType = $parent->defaultChild();
 
             if (!$this->buttonName) {
                 $this->buttonName = _t(
@@ -94,9 +94,9 @@ public function getHTMLFragments($gridField)
             }
         } else {
             $keys = array_keys($children ?? []);
-            $pageTypes = HiddenField::create('PageType', 'Page Type', $keys[0]);
+            $pageTypes = HiddenField::create('RecordType', 'Page Type', $keys[0]);
 
-            $state->pageType = $keys[0];
+            $state->recordType = $keys[0];
 
             if (!$this->buttonName) {
                 $this->buttonName = _t(
@@ -149,8 +149,8 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
             $tmpData = $tmpData['GridFieldSiteTreeAddNewButton'];
 
             $data = array(
-                'ParentID' => $tmpData['currentPageID'],
-                'PageType' => $tmpData['pageType']
+                'ParentID' => $tmpData['currentRecordID'],
+                'RecordType' => $tmpData['recordType']
             );
 
             $controller = Injector::inst()->create(CMSMain::class);

src/Forms/GridFieldSiteTreeEditButton.php

@@ -28,7 +28,7 @@ public function getColumnContent($gridField, $record, $columnName)
         // which can make the form readonly if no edit permissions are available.
 
         $data = ArrayData::create([
-            'Link' => $record->CMSEditLink(),
+            'Link' => $record->getCMSEditLink(),
             'ExtraClass' => $this->getExtraClass(),
         ]);
 

src/Model/Lumberjack.php

@@ -28,7 +28,7 @@
  *
  * @author Michael Strong <mstrong@silverstripe.org>
  *
- * @extends SiteTreeExtension<SiteTree&static>
+ * @extends Extension<SiteTree&static>
  */
 class Lumberjack extends Extension
 {