From d883719c16075412640e623557a2df4275965de1 Mon Sep 17 00:00:00 2001
From: Sabina Talipova <sabina.talipova@silverstripe.com>
Date: Tue, 31 Oct 2023 14:11:06 +1300
Subject: [PATCH] FIX ModelAdmin toast elements

---
 lang/en.yml                                    |  4 +++-
 .../GridFieldDetailForm_ItemRequest.php        | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index d6b088bcd..da8ebaa01 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -103,7 +103,7 @@ en:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
-    Deleted: 'Deleted {type} {name}'
+    Deleted: 'Deleted {type} "{name}"'
     Save: Save
     Saved: 'Saved {name} {link}'
   SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest:
@@ -112,6 +112,8 @@ en:
     NEXT: 'Go to next record'
     PREVIOUS: 'Go to previous record'
     ViewPermissionsFailure: 'It seems you don''t have the necessary permissions to view "{ObjectTitle}"'
+    SAVETOASTMESSAGE: 'Saved {type} "{title}" successfully.'
+    SAVEDUP: 'Saved successfully.'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Edit
   SilverStripe\Forms\GridField\GridFieldFilterHeader:
diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
index fef944f0c..43ddd6bb3 100644
--- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@@ -8,6 +8,7 @@ use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\RequestHandler;
+use SilverStripe\Core\Convert;
 use SilverStripe\Forms\CompositeField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
@@ -543,6 +544,18 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
 
         $form->sessionMessage($message, 'good', ValidationResult::CAST_HTML);
 
+        $message = _t(
+            __CLASS__ . '.SAVETOASTMESSAGE',
+            'Saved {type} "{title}" successfully.',
+            [
+                'type' => $this->record->i18n_singular_name(),
+                'title' => Convert::raw2xml($this->record->Title)
+            ]
+        );
+
+        $controller = $this->getToplevelController();
+        $controller->getResponse()->addHeader('X-Status', $message);
+
         // Redirect after save
         return $this->redirectAfterSave($isNewRecord);
     }
@@ -706,6 +719,8 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
         } elseif ($this->gridField->getList()->byID($this->record->ID)) {
             // Return new view, as we can't do a "virtual redirect" via the CMS Ajax
             // to the same URL (it assumes that its content is already current, and doesn't reload)
+            $message = $controller->getResponse()->getHeader('X-Status') ?? rawurlencode(_t(__CLASS__ . '.SAVEDUP', 'Saved successfully') ?? '');
+            $controller->getResponse()->addHeader('X-Status', $message);
             return $this->edit($controller->getRequest());
         } else {
             // We might be able to redirect to open the record in a different view
@@ -782,7 +797,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
 
         $message = _t(
             'SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Deleted',
-            'Deleted {type} {name}',
+            'Deleted {type} "{name}"',
             [
                 'type' => $this->record->i18n_singular_name(),
                 'name' => htmlspecialchars($title ?? '', ENT_QUOTES)
@@ -800,6 +815,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
         //when an item is deleted, redirect to the parent controller
         $controller = $this->getToplevelController();
         $controller->getRequest()->addHeader('X-Pjax', 'Content'); // Force a content refresh
+        $controller->getResponse()->addHeader('X-Status', $message);
 
         return $controller->redirect($this->getBackLink(), 302); //redirect back to admin section
     }