Merge branch 'hotfix/6.1.3' of https://github.com/espocrm/espocrm into hotfix/6.1.3

application/Espo/Core/Formula/Functions/UtilGroup/GenerateIdType.php

@@ -0,0 +1,44 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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.
+ ************************************************************************/
+
+namespace Espo\Core\Formula\Functions\UtilGroup;
+
+use Espo\Core\Formula\{
+    ArgumentList,
+};
+
+use Espo\Core\Utils\Util;
+
+class GenerateIdType
+{
+    public function process(ArgumentList $args)
+    {
+        return Util::generateId();
+    }
+}

application/Espo/Resources/metadata/app/formula.json

@@ -179,6 +179,10 @@
         {
             "name": "env\\userAttribute",
             "insertText": "env\\userAttribute(ATTRIBUTE)"
+        },
+        {
+            "name": "util\\generateId",
+            "insertText": "util\\generateId()"
         }
     ]
 }

client/src/views/wysiwyg/modals/insert-image.js

@@ -30,8 +30,6 @@ define('views/wysiwyg/modals/insert-image', 'views/modal', function (Dep) {
 
     return Dep.extend({
 
-        backdrop: true,
-
         template: 'wysiwyg/modals/insert-image',
 
         events: {

client/src/views/wysiwyg/modals/insert-link.js

@@ -30,8 +30,6 @@ define('views/wysiwyg/modals/insert-link', 'views/modal', function (Dep) {
 
     return Dep.extend({
 
-        backdrop: true,
-
         template: 'wysiwyg/modals/insert-link',
 
         events: {

tests/unit/Espo/Core/Formula/EvaluatorTest.php

@@ -452,4 +452,15 @@ class EvaluatorTest extends \PHPUnit\Framework\TestCase
 
         $this->assertTrue($result);
     }
+
+    public function testGenerateId()
+    {
+        $expression = "util\generateId()";
+
+        $id = $this->evaluator->process($expression);
+
+        $this->assertIsString($id);
+
+        $this->assertNotEmpty($id);
+    }
 }