Skip to content

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Feb 1, 2022

Backport #18499

  • Correct use UserID in SearchTeams
  • Seperate searching specific user

  • Add condition back

  • Use correct struct type

Co-authored-by: 6543 6543@obermui.de
Co-authored-by: Lunny Xiao xiaolunwen@gmail.com
Co-authored-by: wxiaoguang wxiaoguang@gmail.com
Co-authored-by: techknowlogick techknowlogick@gitea.io
Co-authored-by: Gusted williamzijl7@hotmail.com

Backport go-gitea#18499

* COrrect use `UserID` in `SearchTeams`

- Use `UserID` in the `SearchTeams` function, currently it was useless
to pass such information. Now it does a INNER statement to `team_user`
which obtains UserID -> TeamID data.
- Make OrgID optional.
- Resolves go-gitea#18484

* Seperate searching specific user

* Add condition back

* Use correct struct type

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@zeripath zeripath added this to the 1.16.1 milestone Feb 1, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 1, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 2, 2022
@zeripath zeripath merged commit 9c318a1 into go-gitea:release/v1.16 Feb 2, 2022
@zeripath zeripath deleted the backport-18499-v1.16 branch February 2, 2022 08:40
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants