espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-05-30 09:47:17 +03:00
parent bedb66fdd5 4f00a18599
commit fd50868899
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php
+1 -2
View File
@@ -44,7 +44,6 @@ use Espo\Core\{
};
use ICal\ICal;
use ICal\Event;
use Throwable;
use stdClass;
@@ -85,7 +84,7 @@ class IcsDataLoader implements Loader
$ical->initString($icsContents);
/* @var $event Event */
/* @var \ICal\Event|null $event */
$event = $ical->events()[0] ?? null;
if ($event === null) {
application/Espo/Core/Mail/Event/EventFactory.php
+1 -2
View File
@@ -29,7 +29,6 @@
namespace Espo\Core\Mail\Event;
use ICal\Event as U01jmg3Event;
use ICal\ICal as U01jmg3ICal;
use RuntimeException;
@@ -38,7 +37,7 @@ class EventFactory
{
public static function createFromU01jmg3Ical(U01jmg3ICal $ical): Event
{
/* @var $event U01jmg3Event */
/* @var \ICal\Event|null $event */
$event = $ical->events()[0] ?? null;
if (!$event) {
application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
+6 -4
View File
@@ -31,6 +31,8 @@ namespace Espo\Core\MassAction\Actions;
use Espo\Entities\User;
use Espo\Core\Acl\Table;
use Espo\Core\{
Exceptions\Forbidden,
Exceptions\BadRequest,
@@ -93,11 +95,11 @@ class MassConvertCurrency implements MassAction
{
$entityType = $params->getEntityType();
if (!$this->acl->check($entityType, 'delete')) {
throw new Forbidden("No delete access for '{$entityType}'.");
if (!$this->acl->checkScope($entityType, Table::ACTION_EDIT)) {
throw new Forbidden("No edit access for '{$entityType}'.");
}
if ($this->acl->get('massUpdatePermission') !== 'yes') {
if ($this->acl->get('massUpdatePermission') !== Table::LEVEL_YES) {
throw new Forbidden("No mass-update permission.");
}
@@ -142,7 +144,7 @@ class MassConvertCurrency implements MassAction
$count = 0;
foreach ($collection as $entity) {
if (!$this->acl->checkEntity($entity, 'edit')) {
if (!$this->acl->checkEntity($entity, Table::ACTION_EDIT)) {
continue;
}