8.2.2

application/Espo/Resources/metadata/clientDefs/DynamicLogic.json

@@ -212,6 +212,10 @@
             "view": "views/admin/dynamic-logic/conditions/field-types/link",
             "typeList": ["isEmpty", "isNotEmpty", "equals", "notEquals"]
         },
+        "linkOne": {
+            "view": "views/admin/dynamic-logic/conditions/field-types/link",
+            "typeList": ["isEmpty", "isNotEmpty", "equals", "notEquals"]
+        },
         "file": {
             "view": "views/admin/dynamic-logic/conditions/field-types/link",
             "typeList": ["isEmpty", "isNotEmpty"]

application/Espo/Resources/metadata/entityDefs/ActionHistoryRecord.json

@@ -69,7 +69,7 @@
     },
     "collection": {
         "orderBy": "number",
-        "order": "asc",
+        "order": "desc",
         "textFilterFields": ["ipAddress", "userName"],
         "countDisabled": true
     },

application/Espo/Resources/metadata/entityDefs/User.json

@@ -374,6 +374,7 @@
             "type": "link",
             "notStorable": true,
             "readOnly": true,
+            "customizationDisabled": true,
             "utility": true
         },
         "avatar": {

application/Espo/Resources/metadata/fields/personName.json

@@ -17,7 +17,8 @@
     ],
     "fields": {
         "salutation": {
-            "type": "enum"
+            "type": "enum",
+            "customizationOptionsReferenceDisabled": true
         },
         "first": {
             "type": "varchar",

application/Espo/Resources/metadata/scopes/EmailTemplate.json

@@ -4,5 +4,6 @@
     "tab": true,
     "acl": true,
     "aclFieldLevelDisabled": true,
-    "customizable": false
+    "customizable": false,
+    "importable": true
 }

client/res/templates/import/step-1.tpl

@@ -137,7 +137,7 @@
                 </div>
                 <div class="row">
                     <div class="col-sm-4 form-group cell">
-                        <label class="control-label">{{translate 'Run Manually' scope='Import' category='messages'}}</label>
+                        <label class="control-label">{{translate 'Run Manually' scope='Import' category='labels'}}</label>
                         <div data-name="manualMode" class="field">
                             {{{manualModeField}}}
                         </div>

client/src/views/admin/link-manager/modals/edit.js

@@ -594,32 +594,32 @@ class LinkManagerEditModalView extends ModalView {
         let linkForeign;
 
         if (linkType === 'childrenToParent') {
-                this.model.set('link', 'parent');
-                this.model.set('label', 'Parent');
+            this.model.set('link', 'parent');
+            this.model.set('label', 'Parent');
 
-                linkForeign = this.toPlural(Espo.Utils.lowerCaseFirst(this.scope));
+            linkForeign = this.toPlural(Espo.Utils.lowerCaseFirst(this.scope));
 
-                if (this.getMetadata().get(['entityDefs', this.scope, 'links', 'parent'])) {
-                    this.model.set('link', 'parentAnother');
-                    this.model.set('label', 'Parent Another');
+            if (this.getMetadata().get(['entityDefs', this.scope, 'links', 'parent'])) {
+                this.model.set('link', 'parentAnother');
+                this.model.set('label', 'Parent Another');
 
-                    linkForeign += 'Another';
-                }
+                linkForeign += 'Another';
+            }
 
-                this.model.set('linkForeign', linkForeign);
+            this.model.set('linkForeign', linkForeign);
 
-                this.model.set('labelForeign', '');
-                this.model.set('entityForeign', null);
+            this.model.set('labelForeign', null);
+            this.model.set('entityForeign', null);
 
-                return;
+            return;
         }
         else {
             if (!entityForeign || !linkType) {
-                this.model.set('link', '');
-                this.model.set('linkForeign', '');
+                this.model.set('link', null);
+                this.model.set('linkForeign', null);
 
-                this.model.set('label', '');
-                this.model.set('labelForeign', '');
+                this.model.set('label', null);
+                this.model.set('labelForeign', null);
 
                 return;
             }
@@ -661,10 +661,12 @@ class LinkManagerEditModalView extends ModalView {
 
                 let relationName;
 
-                if (this.scope.localeCompare(entityForeign)) {
-                    relationName = Espo.Utils.lowerCaseFirst(this.scope) + entityForeign;
-                } else {
-                    relationName = Espo.Utils.lowerCaseFirst(entityForeign) + this.scope;
+                relationName = this.scope.localeCompare(entityForeign) ?
+                    Espo.Utils.lowerCaseFirst(this.scope) + entityForeign :
+                    Espo.Utils.lowerCaseFirst(entityForeign) + this.scope;
+
+                if (relationName[0] !== 'c' || !/[A-Z]/.test(relationName[1])) {
+                    relationName = 'c' + Espo.Utils.upperCaseFirst(relationName);
                 }
 
                 this.model.set('relationName', relationName);
@@ -715,11 +717,21 @@ class LinkManagerEditModalView extends ModalView {
         this.model.set('link', link);
         this.model.set('linkForeign', linkForeign);
 
-        const label = Espo.Utils.upperCaseFirst(link.replace(/([a-z])([A-Z])/g, '$1 $2'));
-        const labelForeign = Espo.Utils.upperCaseFirst(linkForeign.replace(/([a-z])([A-Z])/g, '$1 $2'));
+        let label = Espo.Utils.upperCaseFirst(link.replace(/([a-z])([A-Z])/g, '$1 $2'));
+        let labelForeign = Espo.Utils.upperCaseFirst(linkForeign.replace(/([a-z])([A-Z])/g, '$1 $2'));
 
-        this.model.set('label', label);
-        this.model.set('labelForeign', labelForeign);
+        if (label.startsWith('C ')) {
+            label = label.substring(2);
+        }
+
+        if (labelForeign.startsWith('C ')) {
+            labelForeign = labelForeign.substring(2);
+        }
+
+        // @todo Use entity labels as initial link labels?
+
+        this.model.set('label', label || null);
+        this.model.set('labelForeign', labelForeign || null);
     }
 
     handleLinkChange(field) {

client/src/views/fields/link-multiple.js

@@ -538,7 +538,8 @@ class LinkMultipleFieldView extends BaseFieldView {
                         });
                     },
                     lookupFunction: query => {
-                        return Espo.Ajax.getRequest(this.getAutocompleteUrl(query), {q: query})
+                        return Promise.resolve(this.getAutocompleteUrl(query))
+                            .then(url => Espo.Ajax.getRequest(url, {q: query}))
                             .then(/** {list: Record[]} */response => {
                                 return response.list.map(item => ({
                                     value: item.name,

client/src/views/fields/link.js

@@ -728,7 +728,8 @@ class LinkFieldView extends BaseFieldView {
                             });
                         },
                         lookupFunction: query => {
-                            return Espo.Ajax.getRequest(this.getAutocompleteUrl(query), {q: query})
+                            return Promise.resolve(this.getAutocompleteUrl(query))
+                                .then(url => Espo.Ajax.getRequest(url, {q: query}))
                                 .then(/** {list: Record[]} */response => {
                                     return response.list.map(item => ({
                                         value: item.name,

client/src/views/import/step1.js

@@ -201,9 +201,9 @@ class Step1ImportView extends View {
                     'update',
                 ],
                 translatedOptions: {
-                    create: this.translate('Create Only', 'labels', 'Admin'),
-                    createAndUpdate: this.translate('Create and Update', 'labels', 'Admin'),
-                    update: this.translate('Update Only', 'labels', 'Admin'),
+                    create: this.translate('Create Only', 'labels', 'Import'),
+                    createAndUpdate: this.translate('Create and Update', 'labels', 'Import'),
+                    update: this.translate('Update Only', 'labels', 'Import'),
                 },
             },
         });
@@ -673,7 +673,7 @@ class Step1ImportView extends View {
             label = label.replace(new RegExp(item, 'g'), value);
         }
 
-        return format + ' - ' + label;
+        return format + ' · ' + label;
     }
 
     getDateFormatDataList() {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "espocrm",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "espocrm",
-      "version": "8.2.0",
+      "version": "8.2.2",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "description": "Open-source CRM.",
   "repository": {
     "type": "git",

upgrades/8.2/scripts/BeforeUpgrade.php

@@ -0,0 +1,148 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+use Espo\Core\Container;
+use Espo\ORM\EntityManager;
+
+/** @noinspection PhpMultipleClassDeclarationsInspection */
+class BeforeUpgrade
+{
+    private ?Container $container = null;
+
+    /**
+     * @throws Exception
+     */
+    public function run(Container $container): void
+    {
+        $this->container = $container;
+        $this->processCheckExtensions();
+
+        $this->checkRepositories($container->getByClass(EntityManager::class));
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function checkRepositories(EntityManager $em): void
+    {
+        /** @var class-string[] $classNameList */
+        $classNameList = [
+            "Espo\\Repositories\\ActionHistoryRecord",
+            "Espo\\Repositories\\NextNumber",
+            "Espo\\Repositories\\AuthLogRecord",
+            "Espo\\Repositories\\AuthToken",
+            "Espo\\Modules\\Crm\\Repositories\\Account",
+            "Espo\\Modules\\Crm\\Repositories\\Call",
+            "Espo\\Modules\\Crm\\Repositories\\CaseObj",
+            "Espo\\Modules\\Crm\\Repositories\\Contact",
+            "Espo\\Modules\\Crm\\Repositories\\KnowledgeBaseArticle",
+            "Espo\\Modules\\Crm\\Repositories\\Lead",
+            "Espo\\Modules\\Crm\\Repositories\\Meeting",
+            "Espo\\Modules\\Crm\\Repositories\\Opportunity",
+            "Espo\\Modules\\Crm\\Repositories\\TargetList",
+            "Espo\\Modules\\Crm\\Repositories\\Task",
+        ];
+
+        $list = [];
+
+        foreach ($em->getMetadata()->getEntityTypeList() as $entityType) {
+            if (!$em->hasRepository($entityType)) {
+                continue;
+            }
+
+            $repository = $em->getRepository($entityType);
+
+            if (in_array(get_class($repository), $classNameList)) {
+                continue;
+            }
+
+            foreach ($classNameList as $className) {
+                if (is_a($repository, $className)) {
+                    $list[] = get_class($repository);
+                }
+            }
+        }
+
+        if ($list === []) {
+            return;
+        }
+
+        $msg = implode(', ', $list) .
+            " should extend from Espo\\Core\\Repositories\\Database. Fix before upgrading.";
+
+        throw new Exception($msg);
+    }
+
+    /**
+     * @throws Error
+     */
+    private function processCheckExtensions(): void
+    {
+        $errorMessageList = [];
+
+        $this->processCheckExtension('Advanced Pack', '3.1.0', $errorMessageList);
+        $this->processCheckExtension('Real Estate', '1.8.0', $errorMessageList);
+
+        if (!count($errorMessageList)) {
+            return;
+        }
+
+        $message = implode("\n\n", $errorMessageList);
+
+        throw new Error($message);
+    }
+
+    private function processCheckExtension(string $name, string $minVersion, array &$errorMessageList): void
+    {
+        $em = $this->container->get('entityManager');
+
+        $extension = $em->getRDBRepository('Extension')
+            ->where([
+                'name' => $name,
+                'isInstalled' => true,
+            ])
+            ->findOne();
+
+        if (!$extension) {
+            return;
+        }
+
+        $version = $extension->get('version');
+
+        if (version_compare($version, $minVersion, '>=')) {
+            return;
+        }
+
+        $message =
+            "EspoCRM 8.2 is not compatible with '$name' extension of versions lower than $minVersion. " .
+            "Please upgrade the extension or uninstall it.";
+
+        $errorMessageList[] = $message;
+    }
+}