Skip to content

Fix activity params for archiving boards. Solves #7317 #7513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gidan80 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix activity params for archiving boards. Solves #7317 #7513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Activity/ActivityManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ public function getActivityFormat($language, $subjectIdentifier, $subjectParams
break;
case self::SUBJECT_BOARD_UPDATE_ARCHIVED:
if (isset($subjectParams['after']) && $subjectParams['after']) {
$subject = $ownActivity ? $l->t('You have archived the board {board}') : $l->t('{user} has archived the board {before}');
$subject = $ownActivity ? $l->t('You have archived the board {board}') : $l->t('{user} has archived the board {board}');
} else {
$subject = $ownActivity ? $l->t('You have unarchived the board {board}') : $l->t('{user} has unarchived the board {before}');
$subject = $ownActivity ? $l->t('You have unarchived the board {board}') : $l->t('{user} has unarchived the board {board}');
}
break;
case self::SUBJECT_STACK_CREATE:
Expand Down
4 changes: 2 additions & 2 deletions lib/Activity/DeckProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,14 @@
$params['before'] = [
'type' => 'highlight',
'id' => (string)$subjectParams['before'],
'name' => $subjectParams['before'] ?? ''
'name' => (string)$subjectParams['before'] ?? ''

Check failure on line 365 in lib/Activity/DeckProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

TypeDoesNotContainNull 

lib/Activity/DeckProvider.php:365:51: TypeDoesNotContainNull: Cannot resolve types for $<tmp coalesce var>13619 - string does not contain null (see https://psalm.dev/090)

Check failure on line 365 in lib/Activity/DeckProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

RedundantCondition 

lib/Activity/DeckProvider.php:365:15: RedundantCondition: Type string for $<tmp coalesce var>13619 is never null (see https://psalm.dev/122)
];
}
if (array_key_exists('after', $subjectParams)) {
$params['after'] = [
'type' => 'highlight',
'id' => (string)$subjectParams['after'],
'name' => $subjectParams['after'] ?? ''
'name' => (string)$subjectParams['after'] ?? ''

Check failure on line 372 in lib/Activity/DeckProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

TypeDoesNotContainNull 

lib/Activity/DeckProvider.php:372:50: TypeDoesNotContainNull: Cannot resolve types for $<tmp coalesce var>13829 - string does not contain null (see https://psalm.dev/090)

Check failure on line 372 in lib/Activity/DeckProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

RedundantCondition 

lib/Activity/DeckProvider.php:372:15: RedundantCondition: Type string for $<tmp coalesce var>13829 is never null (see https://psalm.dev/122)
];
}
if (array_key_exists('card', $subjectParams) && $event->getSubject() === ActivityManager::SUBJECT_CARD_UPDATE_TITLE) {
Expand Down
Loading