Merge branch 'hotfix/6.1.6'

application/Espo/Core/Utils/File/Permission.php

@@ -390,7 +390,7 @@ class Permission
     protected function chmodReal($filename, $mode)
     {
         try {
-            $result = chmod($filename, $mode);
+            $result = @chmod($filename, $mode);
         } catch (\Exception $e) {
             $result = false;
         }
@@ -400,7 +400,7 @@ class Permission
             $this->chgrp($filename, $this->getDefaultGroup(true));
 
             try {
-                $result = chmod($filename, $mode);
+                $result = @chmod($filename, $mode);
             } catch (\Exception $e) {
                 throw new Error($e->getMessage());
             }
@@ -412,7 +412,7 @@ class Permission
     protected function chownReal($path, $user)
     {
         try {
-            $result = chown($path, $user);
+            $result = @chown($path, $user);
         } catch (\Exception $e) {
             throw new Error($e->getMessage());
         }
@@ -423,7 +423,7 @@ class Permission
     protected function chgrpReal($path, $group)
     {
         try {
-            $result = chgrp($path, $group);
+            $result = @chgrp($path, $group);
         } catch (\Exception $e) {
             throw new Error($e->getMessage());
         }

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json

@@ -645,8 +645,7 @@
         "campaign": {
             "type": "belongsTo",
             "entity": "Campaign",
-            "foreign": "contacts",
-            "noJoin": true
+            "foreign": "contacts"
         },
         "campaignLogRecords": {
             "type": "hasChildren",

application/Espo/Resources/defaults/config.php

@@ -44,7 +44,7 @@ return [
     'version' => '@@version',
     'timeZone' => 'UTC',
     'dateFormat' => 'DD.MM.YYYY',
-    'timeFormat' => 'hh:mm',
+    'timeFormat' => 'HH:mm',
     'weekStart' => 0,
     'thousandSeparator' => ',',
     'decimalMark' => '.',

client/src/views/notification/badge.js

@@ -152,7 +152,11 @@ define('views/notification/badge', 'view', function (Dep) {
         checkBypass: function () {
             var last = this.getRouter().getLast() || {};
 
-            if (last.controller == 'Admin' && last.action == 'upgrade') {
+            if (
+                last.controller == 'Admin'
+                &&
+                ~['upgrade', 'extensions'].indexOf(last.action)
+            ) {
                 return true;
             }
         },

upgrades/6.1.5-6.1.6/data.json

@@ -0,0 +1,4 @@
+{
+    "manifest": {
+    }
+}

upgrades/6.1.5-6.1.6/scripts/AfterUpgrade.php

@@ -0,0 +1,52 @@
+<?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.
+ ************************************************************************/
+
+class AfterUpgrade
+{
+    private $container;
+
+    public function run($container)
+    {
+        $this->container = $container;
+
+        $this->fixTimeFormat();
+    }
+
+    protected function fixTimeFormat()
+    {
+        $config = $this->container->get('config');
+
+        $actualTimeFormat = $config->get('timeFormat');
+
+        if ($actualTimeFormat === 'hh:mm') {
+            $config->set('timeFormat', 'HH:mm');
+            $config->save();
+        }
+    }
+}

upgrades/6.1/scripts/AfterUpgrade.php

@@ -35,17 +35,28 @@ class AfterUpgrade
     {
         $this->container = $container;
 
-        $config = $container->get('config');
-
-        $config->set('pdfEngine', 'Tcpdf');
-
-        $config->save();
+        $this->updateConfig();
 
         $this->removeUnnecessaryFiles();
         $this->removeUnnecessaryDirectories();
     }
 
-    public function removeUnnecessaryFiles()
+    protected function updateConfig()
+    {
+        $config = $this->container->get('config');
+
+        $actualTimeFormat = $config->get('timeFormat');
+
+        if ($actualTimeFormat === 'hh:mm') {
+            $config->set('timeFormat', 'HH:mm');
+        }
+
+        $config->set('pdfEngine', 'Tcpdf');
+
+        $config->save();
+    }
+
+    protected function removeUnnecessaryFiles()
     {
         $fileList = [
             'vendor/spatie/async/.git/objects/pack/pack-14ab89d3ff365322e20cfd44252880928aaa4ed6.idx',
@@ -72,7 +83,7 @@ class AfterUpgrade
         }
     }
 
-    public function removeUnnecessaryDirectories()
+    protected function removeUnnecessaryDirectories()
     {
         $directoryList = [
             'vendor/spatie/async/.git',