Merge branch '1' into 2.0

silverstripe · Mar 15, 2023 · 3dfade2 · 3dfade2
2 parents 503b14d + c425825
commit 3dfade2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/_config/themes.yml b/_config/themes.yml
@@ -0,0 +1,7 @@
+---
+Name: adminthemes
+---
+SilverStripe\Admin\LeftAndMain:
+  admin_themes:
+    - 'silverstripe/admin:cms-forms'
+    - '$default'
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
@@ -421,7 +421,7 @@ $.entwine('ss', function($){
 
         //Reopen toggle fields
         if(toggleComposite.length > 0){
-          toggleComposite.accordion('activate', toggleComposite.find('.ui-accordion-header'));
+          toggleComposite.accordion('option', 'active', toggleComposite.find('.ui-accordion-header'));
         }
 
         //Calculate position for scroll

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -173,15 +173,19 @@ class LeftAndMain extends Controller implements PermissionProvider
     private string $httpErrorMessage;
 
     /**
-     * Assign themes to use for cms
+     * Used to allow errors to be displayed using a front-end template
+     */
+    private bool $suppressAdminErrorContext = false;
+
+    /**
+     * Themes to use within the CMS
+     *
+     * Default themes are assigned in _config/themes.yml
      *
      * @config
      * @var array
      */
-    private static $admin_themes = [
-        'silverstripe/admin:cms-forms',
-        SSViewer::DEFAULT_THEME,
-    ];
+    private static $admin_themes = [];
 
     /**
      * Codes which are required from the current user to view this controller.
@@ -635,6 +639,7 @@ protected function init()
                 ),
             ];
 
+            $this->suppressAdminErrorContext = true;
             Security::permissionFailure($this, $messageSet);
             return;
         }
@@ -760,7 +765,8 @@ protected function init()
 
     public function afterHandleRequest()
     {
-        if ($this->response->isError()
+        if (!$this->suppressAdminErrorContext
+            && $this->response->isError()
             && !$this->request->isAjax()
             && $this->response->getHeader('Content-Type') !== 'application/json'
         ) {