Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX ModelAdmin toast elements #11037

Merged
merged 1 commit into from
Nov 12, 2023
Merged

FIX ModelAdmin toast elements #11037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lang/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
18 changes: 17 additions & 1 deletion src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
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;
Expand Down Expand Up @@ -543,6 +544,18 @@ public function doSave($data, $form)

$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);
}
Expand Down Expand Up @@ -706,6 +719,8 @@ protected function redirectAfterSave($isNewRecord)
} 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
Expand Down Expand Up @@ -782,7 +797,7 @@ public function doDelete($data, $form)

$message = _t(
'SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Deleted',
'Deleted {type} {name}',
'Deleted {type} "{name}"',
[
'type' => $this->record->i18n_singular_name(),
'name' => htmlspecialchars($title ?? '', ENT_QUOTES)
Expand All @@ -800,6 +815,7 @@ public function doDelete($data, $form)
//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
}
Expand Down