Skip to content

[pull] develop from baserow:develop#345

Merged
pull[bot] merged 2 commits into
code:developfrom
baserow:develop
Jul 1, 2026
Merged

[pull] develop from baserow:develop#345
pull[bot] merged 2 commits into
code:developfrom
baserow:develop

Conversation

@pull

@pull pull Bot commented Jul 1, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

…dmin (#5625)

* fix(core): only delete workspaces where a deleted user was the last admin

delete_expired_users_and_related_workspaces_if_last_admin scanned every
workspace and deleted any with no non-deleted admin, so an admin-less
workspace unrelated to the users being deleted was wrongly removed.

Restrict the candidates to workspaces where one of the deleted users was
actually an admin (Exists subquery), keeping the existing 'no active
admin left after deletion' check.

* chore(core): address review feedback

Fix comment grammar and materialize id querysets to sets in the
workspace-deletion regression test.
…ember's role (#5627)

Accepting an invitation went through add_user_to_workspace, which did a blind
update_or_create that overwrote an existing member's permissions. A user could
invite an email as MEMBER, change their own account email to it, then accept —
demoting themselves and potentially leaving the workspace without an admin.

Make add_user_to_workspace idempotent via get_or_create so an existing member's
role is never overwritten, and emit workspace_user_added only on actual creation.
@pull pull Bot locked and limited conversation to collaborators Jul 1, 2026
@pull pull Bot added the ⤵️ pull label Jul 1, 2026
@pull pull Bot merged commit 21e320e into code:develop Jul 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant