Merge branch '2.2' into 2

Kevinn1109 · Apr 13, 2024 · 5f169e1 · 5f169e1
2 parents a667c2d + 3a2b82a
commit 5f169e1
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 4 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/legacy/LeftAndMain.Preview.js b/client/src/legacy/LeftAndMain.Preview.js
@@ -1,5 +1,5 @@
-import $ from 'jquery';
 import i18n from 'i18n';
+import $ from 'jquery';
 
 $.entwine('ss.preview', function($){
 
@@ -506,8 +506,10 @@ $.entwine('ss.preview', function($){
       var id = $(doc).find('meta[name=x-page-id]').attr('content');
       var editLink = $(doc).find('meta[name=x-cms-edit-link]').attr('content');
       var contentPanel = $('.cms-content');
+      // ID may not be on the page
+      var inputId = contentPanel.find(':input[name=ID]').val();
 
-      if(id && contentPanel.find(':input[name=ID]').val() != id) {
+      if(id && (inputId !== undefined && inputId != id)) {
         // Ignore behaviour without history support (as we need ajax loading
         // for the new form to load in the background)
         $('.cms-container').entwine('.ss').loadPanel(editLink);

diff --git a/client/src/styles/legacy/_forms.scss b/client/src/styles/legacy/_forms.scss
@@ -584,6 +584,10 @@ button.loading {
       }
     }
   }
+
+  .ui-accordion-content-active:not([style*="height"]) {
+    overflow: visible;
+  }
 }
 
 

diff --git a/tests/behat/features/gridfield-import.feature b/tests/behat/features/gridfield-import.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Import in GridField
   As a site owner
   I want confidence that only users with permission can import records

diff --git a/tests/behat/features/gridfield-search.feature b/tests/behat/features/gridfield-search.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Search in GridField
   As an author
   I want to search an item in the CMS

diff --git a/tests/behat/features/gridfield-toast-messages.feature b/tests/behat/features/gridfield-toast-messages.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Show toast messages
   As an author
   I want to see toast message in the CMS when I create, edit, delete, publish, unpublish, archive a record

diff --git a/tests/behat/features/gridfield-with-arbitrarydata.feature b/tests/behat/features/gridfield-with-arbitrarydata.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Use Gridfield with arbitrary data
   As a developer
   I want to be able to view and edit data from some arbitrary source

diff --git a/tests/behat/features/gridfield-with-arraydata.feature b/tests/behat/features/gridfield-with-arraydata.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Use Gridfield with ArrayData
   As a developer
   I want to be able to view read-only data from some arbitrary source

diff --git a/tests/behat/features/multitab-validation.feature b/tests/behat/features/multitab-validation.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Multi-tab page validation icons
   As a content author
   I want to see which tabs have form fields that failed validation

diff --git a/tests/behat/features/notfound.feature b/tests/behat/features/notfound.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Not found
   As a site owner
   I want error messages to be displayed in the context of the admin section

diff --git a/tests/behat/features/site-settings.feature b/tests/behat/features/site-settings.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Site settings
   As a site owner
   I want to be able to change site settings

diff --git a/tests/behat/features/validation.feature b/tests/behat/features/validation.feature
@@ -1,3 +1,4 @@
+@retry
 Feature: Form validation
   As a content author
   I want form validation to work in the CMS
-Original file line number
+Diff line change
@@ Expand Up / @@ -584,6 +584,10 @@ button.loading { @@
           }
         }
       }
+      .ui-accordion-content-active:not([style*="height"]) {
+        overflow: visible;
+      }
     }
@@ Expand Down @@