Merge branch 'hotfix/5.5.7'

application/Espo/Core/Formula/Functions/RecordGroup/CountType.php

@@ -37,6 +37,7 @@ class CountType extends \Espo\Core\Formula\Functions\Base
     protected function init()
     {
         $this->addDependency('entityManager');
+        $this->addDependency('selectManagerFactory');
     }
 
     public function process(\StdClass $item)
@@ -49,12 +50,27 @@ class CountType extends \Espo\Core\Formula\Functions\Base
             throw new Error();
         }
 
-        if (count($item->value) < 3) {
+        if (count($item->value) < 1) {
             throw new Error();
         }
 
         $entityType = $this->evaluate($item->value[0]);
 
+        if (count($item->value) < 3) {
+            $filter = null;
+            if (count($item->value) == 2) {
+                $filter = $this->evaluate($item->value[1]);
+            }
+
+            $selectManager = $this->getInjection('selectManagerFactory')->create($entityType);
+            $selectParams = $selectManager->getEmptySelectParams();
+            if ($filter) {
+                $selectManager->applyFilter($filter, $selectParams);
+            }
+
+            return $this->getInjection('entityManager')->getRepository($entityType)->count($selectParams);
+        }
+
         $whereClause = [];
 
         $i = 1;

application/Espo/Jobs/CheckNewVersion.php

@@ -55,7 +55,7 @@ class CheckNewVersion extends \Espo\Core\Jobs\Base
     protected function getRunTime()
     {
         $hour = rand(0, 4);
-        $minute = rand(0, 60);
+        $minute = rand(0, 59);
 
         $nextDay = new \DateTime('+ 1 day');
         $time = $nextDay->format('Y-m-d') . ' ' . $hour . ':' . $minute . ':00';

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

@@ -168,6 +168,14 @@
             "name": "entity\\countRelated",
             "insertText": "entity\\countRelated(LINK, FILTER)"
         },
+        {
+            "name": "record\\exists",
+            "insertText": "record\\exists(ENTITY_TYPE, KEY, VALUE)"
+        },
+        {
+            "name": "record\\count",
+            "insertText": "record\\count(ENTITY_TYPE, KEY, VALUE)"
+        },
         {
             "name": "env\\userAttribute",
             "insertText": "env\\userAttribute(ATTRIBUTE)"

install/core/tpl/errors.tpl

@@ -11,7 +11,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/core/tpl/footer.tpl

@@ -1,2 +1,2 @@
-<p class="credit small">&copy; 2018 <a href="http://www.espocrm.com">EspoCRM</a></p>
+<p class="credit small">&copy; 2019 <a href="http://www.espocrm.com">EspoCRM</a></p>
 

install/core/tpl/setupConfirmation.tpl

@@ -92,7 +92,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/core/tpl/step2.tpl

@@ -59,7 +59,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/core/tpl/step3.tpl

@@ -37,7 +37,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/core/tpl/step4.tpl

@@ -137,7 +137,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/core/tpl/step5.tpl

@@ -109,7 +109,7 @@
 </div>
 <div class="loading-panel hide">
     <div class="text-right">
-        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+        <i class="fas fa-spinner fa-spin"></i>
     </div>
 </div>
 <footer class="modal-footer">

install/css/install.css

@@ -146,29 +146,7 @@ span.ok {
     padding: 0px 2px;
 }
 
-.glyphicon-refresh-animate {
-    -animation: front .5s infinite linear;
-    -ms-animation: front .5s infinite linear;
-    -webkit-animation: right .5s infinite linear;
-    -moz-animation: left .5s infinite linear;
-}
-
-@keyframes front {
-    from { transform: scale(1) rotate(0deg);}
-    to { transform: scale(1) rotate(360deg);}
-}
-
-@-webkit-keyframes right {
-    from { -webkit-transform: rotate(0deg);}
-    to { -webkit-transform: rotate(360deg);}
-}
-
-@-moz-keyframes left {
-    from { -moz-transform: rotate(0deg);}
-    to { -moz-transform: rotate(360deg);}
-}
-
 #license-agree {
     margin-right: 5px;
     margin-top: -1px;
-}
+}