Merge branch '5.3'

* 5.3: Update changelog for 5.3.10 release [AdminBundle] Fix unnecessary collapsing of top-nav when zooming [FormBundle] previous bugfix to avoid empty rows caused another bug (#2614) [PagepartBundle] Fixed not being able to search for translated names of PageParts
Kunstmaan · Jan 19, 2020 · 1162268 · 1162268
2 parents dbb0f43 + e92fb11
commit 1162268
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG-5.X.md b/CHANGELOG-5.X.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.3.10 / 2020-01-19
+
+* [AdminBundle] Fix unnecessary collapsing of top-nav when zooming [#2615](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2615) ([@dbeerten](https://github.com/dbeerten)) 
+* [FormBundle] previous bugfix to avoid empty rows caused another bug [#2614](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2614) ([@Numkil](https://github.com/Numkil)) 
+* [PagepartBundle] Fixed not being able to search for translated names of PageParts [#2588](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2588) ([@poveu](https://github.com/poveu)) 
+
 ## 5.3.9 / 2020-01-15
 
 * [FormBundle] fix export formsubmissions if pagepart order got changed on the form page [#2613](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2613) ([@Numkil](https://github.com/Numkil)) 

diff --git a/src/Kunstmaan/AdminBundle/Resources/public/js/admin-bundle.min.js b/src/Kunstmaan/AdminBundle/Resources/public/js/admin-bundle.min.js
diff --git a/src/Kunstmaan/AdminBundle/Resources/ui/js/_app-top-nav.js b/src/Kunstmaan/AdminBundle/Resources/ui/js/_app-top-nav.js
@@ -27,7 +27,8 @@ kunstmaanbundles.topNav = (function($, window, undefined) {
         var navBarHeight = $navBar.height();
         var singleNavBarItemHeight = $navBar.find('li:first-child').innerHeight();
 
-        if (navBarHeight > singleNavBarItemHeight) {
+
+        if (navBarHeight > singleNavBarItemHeight + 5) { // allow error margin of 5px
             $navBar.addClass(collapseClass);
         } else {
             $navBar.removeClass(collapseClass);

diff --git a/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php b/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php
@@ -141,7 +141,7 @@ public function buildIterator()
                 'language' => $submission->getLang(),
             ];
             foreach ($submission->getFields() as $field) {
-                $fieldName = preg_replace('/\d+/', '', $field->getFieldName());
+                $fieldName = preg_replace('/\d+/', '', $field->getFieldName()) . '' . $field->getSequence();
                 if (!$isHeaderWritten) {
                     $this->addExportField($fieldName, $this->translator->trans($field->getLabel()));
                 }

diff --git a/src/Kunstmaan/PagePartBundle/Resources/views/PagePartAdminTwigExtension/modal.html.twig b/src/Kunstmaan/PagePartBundle/Resources/views/PagePartAdminTwigExtension/modal.html.twig
@@ -1,6 +1,6 @@
 <div class="modal fade pp-chooser js-pp-chooser pp-search" id="pagePartModal{{ pagepartadmin.context }}" tabindex="-1" role="dialog" aria-labelledby="pagePartModalLabel"
      aria-hidden="true"
-     data-pp-types="{{ pagepartadmin.possiblePagePartTypes|json_encode() }}"
+     data-pp-types="{{ pagepartadmin.possiblePagePartTypes|map(pp => {'name': pp.name|trans, 'class': pp.class, 'preview': pp.preview })|json_encode(constant('JSON_UNESCAPED_UNICODE')) }}"
 >
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -20,7 +20,7 @@
             <div class="modal-body clearfix">
                 <div class="row">
                     {% for pagePartType in pagepartadmin.possiblePagePartTypes %}
-                        <div class="pp-search__item js-pp-search-item col-sm-6 col-lg-4" data-pp-name="{{ pagePartType.name }}">
+                        <div class="pp-search__item js-pp-search-item col-sm-6 col-lg-4" data-pp-name="{{ pagePartType.name|trans }}">
                             {% if pagePartType.preview is defined and pagePartType.preview is not empty %}
                                 {% set background = asset(pagePartType.preview) %}
                             {% else %}