mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Allow sending a notification to originator when sending to a single u… (#6752)

Browse Source 
* Allow sending a notification to originator when sending to a single user and suppressSendToOriginator is false

* Add CHANGELOG
This commit is contained in:
Marc Farré 2023-12-18 11:47:40 +01:00 committed by GitHub
parent 9a7c61a217
commit 434318b15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-DEV.md
View File

@ -37,3 +37,4 @@ HumHub Changelog
- Enh #6609: Monthly email summary
- Fix #6721: Top menu entries for spaces are not highlighted when clicked
- Fix #6725: Allow theme without second topbar menu
- Fix #6752: Allow sending a notification to originator when sending to a single user and suppressSendToOriginator is false

12
protected/humhub/modules/notification/components/BaseNotification.php
View File

@ -156,11 +156,11 @@ abstract class BaseNotification extends SocialActivity
$date = null;
}
if(!empty($this->record->payload)) {
if (!empty($this->record->payload)) {
$this->payload = Json::decode($this->record->payload);
}
if($this->hasContent()) {
if ($this->hasContent()) {
$url = Url::to(['/notification/entry', 'id' => $this->record->id, 'cId' => $this->getContent()->id], true);
$relativeUrl = Url::to(['/notification/entry', 'id' => $this->record->id, 'cId' => $this->getContent()->id], false);
} else {
@ -223,7 +223,7 @@ abstract class BaseNotification extends SocialActivity
throw new InvalidConfigException('No moduleId given for "' . get_class($this) . '"');
}
if ($this->isOriginator($user)) {
if ($this->suppressSendToOriginator && $this->isOriginator($user)) {
return;
}
@ -241,8 +241,8 @@ abstract class BaseNotification extends SocialActivity
/**
* Returns a non html encoded mail subject which will be used in the notification e-mail
*
* @see \humhub\modules\notification\targets\MailTarget
* @return string the subject
* @see \humhub\modules\notification\targets\MailTarget
*/
public function getMailSubject()
{
@ -383,9 +383,9 @@ abstract class BaseNotification extends SocialActivity
/**
* Set additional data
*
* @since 1.11
* @param $payload
* @return $this
* @since 1.11
*/
public function payload($payload)
{
@ -583,9 +583,9 @@ abstract class BaseNotification extends SocialActivity
/**
* This method is invoked right before a mail will be send for this notificatoin
*
* @see \humhub\modules\notification\targets\MailTarget
* @param \yii\mail\MessageInterface $message
* @return boolean when true the mail will be send
* @see \humhub\modules\notification\targets\MailTarget
*/
public function beforeMailSend(MessageInterface $message)
{