revert

Author: ebakernz

src/ModuleAdmin.php

@@ -19,63 +19,77 @@ class Admin extends ModelAdmin {
 		Module::class
     );
 
-    public function getEditForm($id = null, $fields = null)
-    {
-        // Get the default form
+    public function getEditForm($id = null, $fields = null){
         $form = parent::getEditForm($id, $fields);
 
-        // GridField name (ModelAdmin sanitises the class)
         $gridFieldName = $this->sanitiseClassName(Module::class);
+        $gridField = $form->Fields()->fieldByName($gridFieldName);
 
-        // Locate the GridField
-        $gridField = $form->Fields()->fieldByName("$gridFieldName");
-        if (!$gridField) {
-            return $form;
-        }
+        // Swap out our "Add" button for the multiclass Add
+        $gridField->getConfig()->addComponent(new GridFieldAddNewMultiClass());
+		$gridField->getConfig()->removeComponentsByType(GridFieldAddNewButton::class);
 
-        $config = $gridField->getConfig();
+        return $form;
+    }
+    
+    // public function getEditForm($id = null, $fields = null)
+    // {
+    //     // Get the default form
+    //     $form = parent::getEditForm($id, $fields);
 
-        // --- Remove default Add button ---
-        $config->removeComponentsByType(GridFieldAddNewButton::class);
+    //     // GridField name (ModelAdmin sanitises the class)
+    //     $gridFieldName = $this->sanitiseClassName(Module::class);
 
-        // --- Remove GridFieldExtensions DetailForm hook that breaks MultiClass ---
-        $config->removeComponentsByType(
-            GridFieldDetailFormItemRequestExtension::class
-        );
+    //     // Locate the GridField
+    //     $gridField = $form->Fields()->fieldByName("Root.$gridFieldName");
+    //     if (!$gridField) {
+    //         return $form;
+    //     }
 
-        // --- Create MultiClass Add component ---
-        $multiClass = new GridFieldAddNewMultiClass();
+    //     $config = $gridField->getConfig();
 
-        // --- Get list of classes dynamically ---
-        $classes = [];
+    //     // --- Remove default Add button ---
+    //     $config->removeComponentsByType(GridFieldAddNewButton::class);
 
-        foreach (ClassInfo::subclassesFor(Module::class) as $class) {
-            if ($class === Module::class) {
-                continue;
-            }
+    //     // --- Remove GridFieldExtensions DetailForm hook that breaks MultiClass ---
+    //     $config->removeComponentsByType(
+    //         GridFieldDetailFormItemRequestExtension::class
+    //     );
 
-            // Skip abstract classes
-            if ((new \ReflectionClass($class))->isAbstract()) {
-                continue;
-            }
+    //     // --- Create MultiClass Add component ---
+    //     $multiClass = new GridFieldAddNewMultiClass();
 
-            // Only include classes that can be created
-            if (!(singleton($class)->canCreate())) {
-                continue;
-            }
+    //     // --- Get list of classes dynamically ---
+    //     $classes = [];
 
-            $classes[$class] = singleton($class)->i18n_singular_name();
-        }
+    //     foreach (ClassInfo::subclassesFor(Module::class) as $class) {
+    //         if ($class === Module::class) {
+    //             continue;
+    //         }
 
-        // Optional: allow project to override/extend via config
-        $configClasses = Config::forClass(self::class)->get('slide_classes') ?? [];
-        $classes = array_merge($classes, $configClasses);
+    //         // Skip abstract classes
+    //         if ((new \ReflectionClass($class))->isAbstract()) {
+    //             continue;
+    //         }
 
-        $multiClass->setClasses($classes);
+    //         // Only include classes that can be created
+    //         if (!(singleton($class)->canCreate())) {
+    //             continue;
+    //         }
 
-        // Add to GridField
-        $config->addComponent($multiClass);
+    //         $classes[$class] = singleton($class)->i18n_singular_name();
+    //     }
+
+    //     // Optional: allow project to override/extend via config
+    //     $configClasses = Config::forClass(self::class)->get('slide_classes') ?? [];
+    //     $classes = array_merge($classes, $configClasses);
+
+    //     $multiClass->setClasses($classes);
+
+    //     // Add to GridField
+    //     $config->addComponent($multiClass);
+
+    //     return $form;
+    // }
 
-        return $form;
-    }
 }