Skip to content

[stable33] fix(bulkReceive): honour admin email toggle and ISetting notification defaults#2608

Merged
miaulalala merged 1 commit into
stable33from
backport/2562/stable33
May 20, 2026
Merged

[stable33] fix(bulkReceive): honour admin email toggle and ISetting notification defaults#2608
miaulalala merged 1 commit into
stable33from
backport/2562/stable33

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented May 20, 2026

Backport of #2562

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

… defaults

The admin Enable notification emails toggle was not checked in
bulkReceive(), so emails could be queued even when the toggle was
disabled. Also, ISetting-based settings that do not implement
ActivitySettings had canChangeNotification() called on them, which
caused a fatal error; the default push-enabled state was also ignored.

Injects IAppConfig and uses getValueString() to check the toggle,
consistent with the approach used elsewhere. ISetting instances that are
not ActivitySettings now fall back to the setting default via
isDefaultEnabledNotification() without calling canChangeNotification().

Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala miaulalala force-pushed the backport/2562/stable33 branch from f0d02e1 to bb7939e Compare May 20, 2026 11:27
@miaulalala miaulalala marked this pull request as ready for review May 20, 2026 11:29
@miaulalala miaulalala merged commit d59736e into stable33 May 20, 2026
56 of 57 checks passed
@miaulalala miaulalala deleted the backport/2562/stable33 branch May 20, 2026 13:19
@cypress
Copy link
Copy Markdown

cypress Bot commented May 20, 2026

Activity    Run #3812

Run Properties:  status check failed Failed #3812  •  git commit 5bd898e004: [stable33] fix(bulkReceive): honour admin email toggle and ISetting notification...
Project Activity
Branch Review backport/2562/stable33
Run status status check failed Failed #3812
Run duration 02m 24s
Commit git commit 5bd898e004: [stable33] fix(bulkReceive): honour admin email toggle and ISetting notification...
Committer backportbot[bot]
View all properties for this run ↗︎

Test results
Tests that failed  Failures 1
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 1
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 8
View all changes introduced in this branch ↗︎

Tests for review

Failed  cypress/e2e/sidebar.cy.ts • 1 failed test • Run E2E

View Output

Test Artifacts
Check activity listing in the sidebar > Has favorite activity Test Replay Screenshots

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant