Merge branch 'fix'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "espocrm",
-  "version": "7.4.4",
+  "version": "7.4.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "espocrm",
-      "version": "7.4.4",
+      "version": "7.4.5",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {

package.json

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

upgrades/7.4.4-7.4.5/data.json

@@ -0,0 +1,2 @@
+{
+}

upgrades/7.4.4-7.4.5/scripts/AfterUpgrade.php

@@ -0,0 +1,80 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://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 General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+use Espo\Core\Container;
+use Espo\Core\Utils\Metadata;
+use Espo\Core\Templates\Entities\Event;
+
+class AfterUpgrade
+{
+    public function run(Container $container): void
+    {
+        $this->updateMetadata($container->get('metadata'));
+    }
+
+    private function updateMetadata(Metadata $metadata): void
+    {
+        $this->updateEventMetadata($metadata);
+
+        $metadata->save();
+    }
+
+    private function updateEventMetadata(Metadata $metadata): void
+    {
+        $defs = $metadata->get(['scopes']);
+
+        foreach ($defs as $entityType => $item) {
+            $isCustom = $item['isCustom'] ?? false;
+            $type = $item['type'] ?? false;
+
+            if (!$isCustom || $type !== Event::TEMPLATE_TYPE) {
+                continue;
+            }
+
+            if (!is_string($metadata->get(['entityDefs', $entityType, 'fields', 'duration', 'select']))) {
+                continue;
+            }
+
+            $metadata->delete('entityDefs', $entityType, 'fields.duration.orderBy');
+
+            $metadata->set('entityDefs', $entityType, [
+                'fields' => [
+                    'duration' => [
+                        'select' => [
+                            'select' => "TIMESTAMPDIFF_SECOND:(dateStart, dateEnd)"
+                        ],
+                        'order' => [
+                            'order' => [["TIMESTAMPDIFF_SECOND:(dateStart, dateEnd)", "{direction}"]]
+                        ],
+                    ]
+                ]
+            ]);
+        }
+    }
+}

upgrades/7.4/scripts/AfterUpgrade.php

@@ -29,6 +29,7 @@
 
 use Espo\Core\Container;
 use Espo\Core\Utils\Metadata;
+use Espo\Core\Templates\Entities\Event;
 
 class AfterUpgrade
 {
@@ -44,6 +45,7 @@ class AfterUpgrade
         ]);
 
         $this->fixParent($metadata);
+        $this->updateEventMetadata($metadata);
 
         $metadata->save();
     }
@@ -69,4 +71,37 @@ class AfterUpgrade
             }
         }
     }
+
+    private function updateEventMetadata(Metadata $metadata): void
+    {
+        $defs = $metadata->get(['scopes']);
+
+        foreach ($defs as $entityType => $item) {
+            $isCustom = $item['isCustom'] ?? false;
+            $type = $item['type'] ?? false;
+
+            if (!$isCustom || $type !== Event::TEMPLATE_TYPE) {
+                continue;
+            }
+
+            if (!is_string($metadata->get(['entityDefs', $entityType, 'fields', 'duration', 'select']))) {
+                continue;
+            }
+
+            $metadata->delete('entityDefs', $entityType, 'fields.duration.orderBy');
+
+            $metadata->set('entityDefs', $entityType, [
+                'fields' => [
+                    'duration' => [
+                        'select' => [
+                            'select' => "TIMESTAMPDIFF_SECOND:(dateStart, dateEnd)"
+                        ],
+                        'order' => [
+                            'order' => [["TIMESTAMPDIFF_SECOND:(dateStart, dateEnd)", "{direction}"]]
+                        ],
+                    ]
+                ]
+            ]);
+        }
+    }
 }