mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-01 09:51:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from butonic/fix-id-or-username-query-handling

Browse Source 
Fix id or username query handling
This commit is contained in:
Phil Davis
2020-10-23 21:29:49 +05:45
committed by GitHub
parent 6e76b72827 031a1b8012
commit ea66c7d0fb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/pkg/service/v0/accounts.go
View File

@@ -230,7 +230,7 @@ func (s Service) findAccountsByQuery(ctx context.Context, query string) ([]strin
qID, qSam := match[1], match[2]
tmp := &proto.Account{}
err = s.repo.LoadAccount(ctx, qID, tmp)
if err != nil {
if err != nil && !storage.IsNotFoundErr(err) {
return nil, err
}
searchResults, err = s.index.FindBy(&proto.Account{}, "OnPremisesSamAccountName", qSam)

7
changelog/unreleased/fix-id-or-username-query-handling.md Normal file
View File

@@ -0,0 +1,7 @@
Bugfix: Fix id or username query handling
Tags: accounts
The code was stopping execution when encountering an error while loading an account by id. But for or queries we can continue execution.
https://github.com/owncloud/ocis/pull/745