Merge branch '4.6'

ibexa · Sep 23, 2024 · d05d299 · d05d299
2 parents 0935c16 + db4475a
commit d05d299
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -532,7 +532,7 @@
                 {{- form_label(form) -}}
             </div>
             <div class="ibexa-field-edit__distraction-free-mode-btns">
-                 <button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--enable">
+                 <button {{ (fieldtype_is_not_translatable or disabled) ? 'disabled' }} type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--enable">
                     <svg class="ibexa-icon ibexa-icon--tiny-small">
                         <use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
                     </svg>
@@ -543,7 +543,7 @@
                         {{ 'distraction_free_mode.enable.label'|trans|desc('Distraction free mode') }}
                     </span>
                 </button>
-                <button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--disable">
+                <button {{ (fieldtype_is_not_translatable or disabled) ? 'disabled' }} type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--disable">
                     <svg class="ibexa-icon ibexa-icon--tiny-small">
                         <use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
                     </svg>

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
@@ -458,7 +458,7 @@ const UniversalDiscoveryModule = (props) => {
 
     useEffect(() => {
         if (currentView === 'grid') {
-            setGridActiveLocationId(markedLocationId);
+            setGridActiveLocationId(markedLocationId ?? defaultMarkedLocationId);
         }
     }, [currentView]);