Merge branch 'hotfix/5.6.10'

application/Espo/ORM/DB/Mapper.php

@@ -257,7 +257,7 @@ abstract class Mapper implements IMapper
 
                 if (!$returnTotalCount) {
                     if (!empty($params['returnSthCollection']) && $relType !== IEntity::HAS_ONE) {
-                        $collection = $this->createSthCollection($entity->getEntityType());
+                        $collection = $this->createSthCollection($relEntity->getEntityType());
                         $collection->setQuery($sql);
                         return $collection;
                     }
@@ -316,7 +316,7 @@ abstract class Mapper implements IMapper
 
                 if (!$returnTotalCount) {
                     if (!empty($params['returnSthCollection'])) {
-                        $collection = $this->createSthCollection($entity->getEntityType());
+                        $collection = $this->createSthCollection($relEntity->getEntityType());
                         $collection->setQuery($sql);
                         return $collection;
                     }

application/Espo/ORM/SthCollection.php

@@ -150,4 +150,9 @@ class SthCollection implements \IteratorAggregate
     {
         return $this->isFetched;
     }
+
+    public function getEntityType()
+    {
+        return $this->entityType;
+    }
 }

application/Espo/Services/LeadCapture.php

@@ -342,6 +342,15 @@ class LeadCapture extends Record
                                'leadCaptureId' => $leadCapture->id,
                             ]);
                         }
+
+                        $this->getInjection('hookManager')->process('LeadCapture', 'afterLeadCapture', $leadCapture, [], [
+                           'targetId' => $contact->id,
+                           'targetType' => 'Contact',
+                        ]);
+
+                        $this->getInjection('hookManager')->process('Contact', 'afterLeadCapture', $contact, [], [
+                           'leadCaptureId' => $leadCapture->id,
+                        ]);
                     }
                 }
             }
@@ -390,6 +399,15 @@ class LeadCapture extends Record
                    'leadCaptureId' => $leadCapture->id,
                 ]);
             }
+
+            $this->getInjection('hookManager')->process('LeadCapture', 'afterLeadCapture', $leadCapture, [], [
+               'targetId' => $targetLead->id,
+               'targetType' => 'Lead',
+            ]);
+
+            $this->getInjection('hookManager')->process('Lead', 'afterLeadCapture', $targetLead, [], [
+               'leadCaptureId' => $leadCapture->id,
+            ]);
         }
 
         if (!$isLogged) {

client/src/views/user/modals/access.js

@@ -38,6 +38,8 @@ Espo.define('views/user/modals/access', 'views/modal', function (Dep) {
 
         header: false,
 
+        backdrop: true,
+
         data: function () {
             return {
                 valuePermissionDataList: this.getValuePermissionList(),