diff options
| author | Giteabot <teabot@gitea.io> | 2024-01-22 16:10:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 09:10:45 +0100 |
| commit | fd1edb9d9d3ca701c6568de75d6ecfeccda88e51 (patch) | |
| tree | c41a6bc11fc1d441edb10599ca81273743a6028c /services/repository | |
| parent | 633996db8eabeee1baa7082ed469ff39e480e8cd (diff) | |
| download | gitea-fd1edb9d9d3ca701c6568de75d6ecfeccda88e51.tar.gz gitea-fd1edb9d9d3ca701c6568de75d6ecfeccda88e51.zip | |
Fix `DeleteCollaboration` transaction behaviour (#28886) (#28889)
Backport #28886 by @KN4CK3R
The method can't be called with an outer transaction because if the user
is not a collaborator the outer transaction will be rolled back even if
the inner transaction uses the no-error path.
`has == 0` leads to `return nil` which cancels the transaction. A
standalone call of this method does nothing but if used with an outer
transaction, that will be canceled.
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Diffstat (limited to 'services/repository')
| -rw-r--r-- | services/repository/collaboration.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/repository/collaboration.go b/services/repository/collaboration.go index eff33c71f3..dccc124748 100644 --- a/services/repository/collaboration.go +++ b/services/repository/collaboration.go @@ -26,9 +26,12 @@ func DeleteCollaboration(ctx context.Context, repo *repo_model.Repository, uid i } defer committer.Close() - if has, err := db.GetEngine(ctx).Delete(collaboration); err != nil || has == 0 { + if has, err := db.GetEngine(ctx).Delete(collaboration); err != nil { return err - } else if err = access_model.RecalculateAccesses(ctx, repo); err != nil { + } else if has == 0 { + return committer.Commit() + } + if err = access_model.RecalculateAccesses(ctx, repo); err != nil { return err } |