Fix bug with unlink action not re-rendering field

silvershop · Jul 30, 2018 · a962987 · a962987
1 parent c0dca04
commit a962987
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/GridFieldHasOneEditButton.php b/src/GridFieldHasOneEditButton.php
@@ -25,24 +25,29 @@ public function getHTMLFragments($gridField)
         if (!$record->exists() || !$record->isInDB()) {
             return parent::getHTMLFragments($gridField); //use parent add button
         }
+
         $singleton = singleton($gridField->getModelClass());
-        if (!$singleton->canCreate()) {
-            return array();
-        }
+        if (!$singleton->canCreate()) return [];
+
         if (!$this->buttonName) {
             // provide a default button name, can be changed by calling {@link setButtonName()} on this component
             $objectName = $singleton->i18n_singular_name();
-            $this->buttonName = _t(GridField::class . '.Edit', 'Edit {name}', array('name' => $objectName));
+            $buttonName = $gridField->getRecord()->exists()
+                ? _t(GridField::class . '.Edit', 'Edit {name}', ['name' => $objectName])
+                : _t(GridField::class . '.Add', 'Add {name}', ['name' => $objectName]);
+
+            $this->setButtonName($buttonName);
         }
+
         $data = ArrayData::create(
-            array(
-                'NewLink' => Controller::join_links($gridField->Link('item'), $record->ID, 'edit'),
+            [
+                'NewLink'    => Controller::join_links($gridField->Link('item'), $record->ID, 'edit'),
                 'ButtonName' => $this->buttonName,
-            )
+            ]
         );
 
-        return array(
-            $this->targetFragment => $data->renderWith(SSViewer::get_templates_by_class(static::class))
-        );
+        return [
+            $this->targetFragment => $data->renderWith(SSViewer::get_templates_by_class(static::class)),
+        ];
     }
 }
diff --git a/src/GridFieldHasOneUnlinkButton.php b/src/GridFieldHasOneUnlinkButton.php
@@ -113,6 +113,7 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
             );
         }
 
+        $gridField->setRecord(null);
         $gridField->getList()->remove($item);
 
         Controller::curr()->getResponse()->setStatusCode(

diff --git a/src/HasOneButtonField.php b/src/HasOneButtonField.php
@@ -35,16 +35,6 @@ public function __construct(DataObject $parent, $relationName, $fieldName = null
         $list = new HasOneButtonRelationList($this->record, $relationName, $parent);
 
         parent::__construct($fieldName ?: $relationName, $title, $list, $config);
-
-        if ($title !== null) {
-            $buttonName = $this->getRecord()->exists()
-                ? _t(GridField::class . '.Edit', 'Edit {name}', ['name' => $title])
-                : _t(GridField::class . '.Add', 'Add {name}', ['name' => $title]);
-
-            /** @var \SilverShop\HasOneField\GridFieldHasOneEditButton $editButton */
-            $editButton = $this->getConfig()->getComponentByType(GridFieldHasOneEditButton::class);
-            $editButton->setButtonName($buttonName);
-        }
     }
 
     /**
@@ -54,4 +44,12 @@ public function getRecord()
     {
         return $this->record;
     }
+
+    /**
+     * @param DataObject|null $record
+     */
+    public function setRecord($record): void
+    {
+        $this->record = $record ?: singleton(get_class($this->record));
+    }
 }