Merge remote-tracking branch 'origin/4.3' into 4.4

ibexa · Feb 24, 2023 · cc20c9e · cc20c9e
2 parents c140fcd + ffcc71a
commit cc20c9e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/bundle/Resources/public/scss/_backdrop.scss b/src/bundle/Resources/public/scss/_backdrop.scss
@@ -6,4 +6,8 @@
     right: 0;
     bottom: 0;
     background-color: rgba($ibexa-color-dark, 0.4);
+
+    &--transparent {
+        background-color: transparent;
+    }
 }
diff --git a/src/lib/UserSetting/Autosave.php b/src/lib/UserSetting/Autosave.php
@@ -8,6 +8,7 @@
 
 namespace Ibexa\AdminUi\UserSetting;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\User\UserSetting\FormMapperInterface;
 use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
@@ -24,10 +25,15 @@ class Autosave implements ValueDefinitionInterface, FormMapperInterface
     /** @var \Symfony\Contracts\Translation\TranslatorInterface */
     private $translator;
 
+    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
+    private $configResolver;
+
     public function __construct(
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ConfigResolverInterface $configResolver
     ) {
         $this->translator = $translator;
+        $this->configResolver = $configResolver;
     }
 
     public function getName(): string
@@ -57,7 +63,7 @@ public function getDisplayValue(string $storageValue): string
 
     public function getDefaultValue(): string
     {
-        return self::ENABLED_OPTION;
+        return $this->configResolver->getParameter('autosave.enabled') == false ? self::DISABLED_OPTION : self::ENABLED_OPTION;
     }
 
     public function mapFieldForm(