FIX ModelAdmin toast elements

silverstripe · Nov 8, 2023 · 22d5471 · 22d5471
1 parent 3ca706b
commit 22d5471
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/LeftAndMain.EditForm.js b/client/src/legacy/LeftAndMain.EditForm.js
@@ -107,6 +107,7 @@ $.entwine('ss', function($){
 
       this._super();
     },
+
     'from .cms-tabset': {
       onafterredrawtabs: function () {
 
@@ -126,10 +127,7 @@ $.entwine('ss', function($){
           'Admin.VALIDATION_ERRORS_ON_PAGE',
           'There are validation errors on this page, please fix them before saving or publishing.'
         );
-        const toastNotificationMessage = ss.i18n._t(
-          'Admin.VALIDATIONERROR',
-          'Validation Error'
-        );
+
         const $editFormErrorBanner = $("#Form_EditForm_error");
 
         // Remove any existing invalid tab icons and screen-reader text
@@ -159,13 +157,6 @@ $.entwine('ss', function($){
           return;
         }
 
-        // Show a toast notification for DataObject::getCMSValidator() validation errors
-        if (!this.getValidationErrorShown() && this.hasClass('validationerror')) {
-          errorMessage(toastNotificationMessage);
-          // Ensure that this error message popup won't be added more than once
-          this.setValidationErrorShown(true);
-        }
-
         // Find tab-pane's with decedent validation .alert's
         const $invalidTabPanes = this.find('.tab-pane .alert-danger, .tab-pane .alert.error').closest('.tab-pane');
         if (!$invalidTabPanes.length) {
@@ -213,6 +204,17 @@ $.entwine('ss', function($){
     redraw: function() {
       if(window.debug) console.log('redraw', this.attr('class'), this.get(0));
 
+      if (!this.getValidationErrorShown() && this.hasClass('validationerror')) {
+        const toastNotificationMessage = ss.i18n._t(
+          'Admin.VALIDATIONERROR',
+          'Validation Error'
+        );
+
+        errorMessage(toastNotificationMessage);
+        // Ensure that this error message popup won't be added more than once
+        this.setValidationErrorShown(true);
+      }
+
       // Force initialization of tabsets to avoid layout glitches
       this.add(this.find('.cms-tabset')).redrawTabs();
       this.find('.cms-content-header').redraw();

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -867,6 +867,9 @@ public function redirect($url, $code = 302)
             if ($this->getRequest()->getHeader('X-Pjax') && !$response->getHeader('X-Pjax')) {
                 $response->addHeader('X-Pjax', $this->getRequest()->getHeader('X-Pjax'));
             }
+            if ($this->getRequest()->getHeader('X-Status') && !$response->getHeader('X-Status')) {
+                $response->addHeader('X-Status', $this->getRequest()->getHeader('X-Status'));
+            }
             $newResponse = new LeftAndMain_HTTPResponse(
                 $response->getBody(),
                 $response->getStatusCode(),