Merge branch 'fix'

application/Espo/ORM/Repository/Deprecation/RDBRepositoryDeprecationTrait.php

@@ -30,7 +30,6 @@
 namespace Espo\ORM\Repository\Deprecation;
 
 use Espo\ORM\Entity;
-use Espo\ORM\Mapper\BaseMapper;
 
 /**
  * @internal
@@ -38,21 +37,6 @@ use Espo\ORM\Mapper\BaseMapper;
  */
 trait RDBRepositoryDeprecationTrait
 {
-    /**
-     * @deprecated Use QueryBuilder instead.
-     * @todo Rewrite usages.
-     */
-    public function deleteFromDb(string $id, bool $onlyDeleted = false): void
-    {
-        $mapper = $this->getMapper();
-
-        if (!$mapper instanceof BaseMapper) {
-            throw new \RuntimeException("Not supported 'deleteFromDb'.");
-        }
-
-        $mapper->deleteFromDb($this->entityType, $id, $onlyDeleted);
-    }
-
     /**
      * Get an entity. If ID is NULL, a new entity is returned.
      *

application/Espo/ORM/Repository/RDBRepository.php

@@ -33,7 +33,6 @@ use Espo\ORM\Defs\RelationDefs;
 use Espo\ORM\EntityCollection;
 use Espo\ORM\EntityManager;
 use Espo\ORM\EntityFactory;
-use Espo\ORM\Collection;
 use Espo\ORM\Name\Attribute;
 use Espo\ORM\Relation\Relations;
 use Espo\ORM\Relation\RelationsMap;
@@ -756,4 +755,15 @@ class RDBRepository implements Repository
 
         $this->getRelation($entity, $name)->relate($related);
     }
+
+    public function deleteFromDb(string $id, bool $onlyDeleted = false): void
+    {
+        $mapper = $this->getMapper();
+
+        if (!$mapper instanceof BaseMapper) {
+            throw new RuntimeException("Not supported 'deleteFromDb'.");
+        }
+
+        $mapper->deleteFromDb($this->entityType, $id, $onlyDeleted);
+    }
 }

application/Espo/Resources/i18n/en_US/LayoutManager.json

@@ -6,7 +6,7 @@
         "align": "Align",
         "panelName": "Panel Name",
         "style": "Style",
-        "sticked": "Sticked",
+        "sticked": "Stick to top",
         "isMuted": "Muted color",
         "isLarge": "Large font size",
         "hidden": "Hidden",