ss5 compat

lekoala · Aug 10, 2023 · 1247ede · 1247ede
1 parent 4665f66
commit 1247ede
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/code/SoftDeleteSecurityAdmin.php b/code/SoftDeleteSecurityAdmin.php
@@ -38,27 +38,39 @@ function updateEditForm(Form $form)
 
         if ($memberSingl->hasExtension('SoftDeletable')) {
             $gridfield = $form->Fields()->dataFieldByName('Members');
-            $config = $gridfield->getConfig();
+            //SS5 compat
+            if (!$gridfield) {
+                $gridfield = $form->Fields()->dataFieldByName('users');
+            }
+            if ($gridfield) {
+                $config = $gridfield->getConfig();
 
-            $config->removeComponentsByType(GridFieldDeleteAction::class);
-            if ($this->owner->config()->softdelete_from_list) {
-                $exclude = $this->owner->config()->softdelete_from_list_exclude;
-                if ($exclude && !in_array($this->owner->modelClass, $exclude)) {
-                    $config->addComponent(new GridFieldSoftDeleteAction());
+                $config->removeComponentsByType(GridFieldDeleteAction::class);
+                if ($this->owner->config()->softdelete_from_list) {
+                    $exclude = $this->owner->config()->softdelete_from_list_exclude;
+                    if ($exclude && !in_array($this->owner->modelClass, $exclude)) {
+                        $config->addComponent(new GridFieldSoftDeleteAction());
+                    }
                 }
-            }
 
-            // No caution because soft :-)
-            $form->Fields()->removeByName('MembersCautionText');
+                // No caution because soft :-)
+                $form->Fields()->removeByName('MembersCautionText');
+            }
         }
 
         if ($groupSingl->hasExtension('SoftDeletable')) {
             $gridfield = $form->Fields()->dataFieldByName('Groups');
-            $config = $gridfield->getConfig();
+            //SS5 compat
+            if (!$gridfield) {
+                $gridfield = $form->Fields()->dataFieldByName('groups');
+            }
+            if ($gridfield) {
+                $config = $gridfield->getConfig();
 
-            $config->removeComponentsByType(GridFieldDeleteAction::class);
-            if ($this->owner->config()->softdelete_from_list) {
-                $config->addComponent(new GridFieldSoftDeleteAction());
+                $config->removeComponentsByType(GridFieldDeleteAction::class);
+                if ($this->owner->config()->softdelete_from_list) {
+                    $config->addComponent(new GridFieldSoftDeleteAction());
+                }
             }
         }
     }