8.2.1

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": {

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) {

package-lock.json

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

package.json

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

upgrades/8.2/scripts/BeforeUpgrade.php

@@ -0,0 +1,96 @@
+<?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
+{
+    /**
+     * @throws Exception
+     */
+    public function run(Container $container): void
+    {
+        $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);
+    }
+}