Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop
commit
35a395c68c
|
@ -140,7 +140,7 @@ class NotifyAdminsBehavior extends Behavior
|
||||||
$entity->id
|
$entity->id
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
$this->notifySiteAdmins($entity->getSource(), $title, $message, $data);
|
$this->notifySiteAdmins($entity->getSource(), $title, $data, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function notifySiteAdminsForEntityDeletion(EntityInterface $entity): void
|
public function notifySiteAdminsForEntityDeletion(EntityInterface $entity): void
|
||||||
|
@ -168,7 +168,7 @@ class NotifyAdminsBehavior extends Behavior
|
||||||
$entity->id
|
$entity->id
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
$this->notifySiteAdmins($entity->getSource(), $title, $message, $data);
|
$this->notifySiteAdmins($entity->getSource(), $title, $data, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -187,8 +187,8 @@ class NotifyAdminsBehavior extends Behavior
|
||||||
public function notifySiteAdmins(
|
public function notifySiteAdmins(
|
||||||
string $origin,
|
string $origin,
|
||||||
string $title,
|
string $title,
|
||||||
string $message,
|
array $data,
|
||||||
array $data
|
string $message = ''
|
||||||
): void {
|
): void {
|
||||||
$this->InboxProcessors = $this->InboxProcessors ?: TableRegistry::getTableLocator()->get('InboxProcessors');
|
$this->InboxProcessors = $this->InboxProcessors ?: TableRegistry::getTableLocator()->get('InboxProcessors');
|
||||||
$processor = $this->InboxProcessors->getProcessor('Notification', 'DataChange');
|
$processor = $this->InboxProcessors->getProcessor('Notification', 'DataChange');
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "1.8",
|
"version": "1.9",
|
||||||
"application": "Cerebrate"
|
"application": "Cerebrate"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue