opted out fields: allow foreign access

espocrm · May 1, 2020 · 83e0d92 · 83e0d92
1 parent 782f223
commit 83e0d92
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Email.php b/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
@@ -121,6 +121,28 @@ protected function load($fieldName, $entityType)
                         'type' => 'bool',
                         'notStorable' => true,
                         'select' => 'emailAddresses.opt_out',
+                        'selectForeign' => [
+                            'sql' => "{$foreignJoinAlias}.opt_out",
+                            'leftJoins' => [
+                                [
+                                    'EntityEmailAddress',
+                                    $foreignJoinMiddleAlias,
+                                    [
+                                        "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id",
+                                        "{$foreignJoinMiddleAlias}.primary" => 1,
+                                        "{$foreignJoinMiddleAlias}.deleted" => 0,
+                                    ]
+                                ],
+                                [
+                                    'EmailAddress',
+                                    $foreignJoinAlias,
+                                    [
+                                        "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.emailAddressId",
+                                        "{$foreignJoinAlias}.deleted" => 0,
+                                    ]
+                                ]
+                            ],
+                        ],
                         'where' => [
                             '= TRUE' => [
                                 'sql' => 'emailAddresses.opt_out = true AND emailAddresses.opt_out IS NOT NULL',

diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php b/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php
@@ -122,6 +122,28 @@ protected function load($fieldName, $entityType)
                         'type' => 'bool',
                         'notStorable' => true,
                         'select' => 'phoneNumbers.opt_out',
+                        'selectForeign' => [
+                            'sql' => "{$foreignJoinAlias}.opt_out",
+                            'leftJoins' => [
+                                [
+                                    'EntityPhoneNumber',
+                                    $foreignJoinMiddleAlias,
+                                    [
+                                        "{$foreignJoinMiddleAlias}.entityId:" => "{alias}.id",
+                                        "{$foreignJoinMiddleAlias}.primary" => 1,
+                                        "{$foreignJoinMiddleAlias}.deleted" => 0,
+                                    ]
+                                ],
+                                [
+                                    'PhoneNumber',
+                                    $foreignJoinAlias,
+                                    [
+                                        "{$foreignJoinAlias}.id:" => "{$foreignJoinMiddleAlias}.phoneNumberId",
+                                        "{$foreignJoinAlias}.deleted" => 0,
+                                    ]
+                                ]
+                            ],
+                        ],
                         'where' => [
                             '= TRUE' => [
                                 'sql' => 'phoneNumbers.opt_out = true AND phoneNumbers.opt_out IS NOT NULL',

diff --git a/application/Espo/Resources/metadata/fields/email.json b/application/Espo/Resources/metadata/fields/email.json
@@ -24,7 +24,6 @@
          "layoutDetailDisabled": true,
          "layoutDefaultSidePanelDisabled": true,
          "mergeDisabled": true,
-         "foreignAccessDisabled": true,
          "customizationDefaultDisabled": true,
          "customizationReadOnlyDisabled": true
       }

diff --git a/application/Espo/Resources/metadata/fields/phone.json b/application/Espo/Resources/metadata/fields/phone.json
@@ -34,7 +34,6 @@
          "notStorable": true,
          "layoutDetailDisabled": true,
          "layoutDefaultSidePanelDisabled": true,
-         "foreignAccessDisabled": true,
          "mergeDisabled": true,
          "customizationDefaultDisabled": true,
          "customizationReadOnlyDisabled": true