lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

List limited and private orgs if authenticated on API (#16866) (#16879)

Browse source
This commit is contained in:
6543 2021-08-31 12:49:02 +02:00 committed by GitHub
parent af1fd56d8a
commit 3ac1f35349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
routers/api/v1/admin/org.go
View file

@ -106,6 +106,7 @@ func GetAllOrgs(ctx *context.APIContext) {
listOptions := utils.GetListOptions(ctx) listOptions := utils.GetListOptions(ctx)
users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{ users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
Actor: ctx.User,
Type: models.UserTypeOrganization, Type: models.UserTypeOrganization,
OrderBy: models.SearchOrderByAlphabetically, OrderBy: models.SearchOrderByAlphabetically,
ListOptions: listOptions, ListOptions: listOptions,

1
routers/api/v1/org/org.go
View file

@ -130,6 +130,7 @@ func GetAll(ctx *context.APIContext) {
listOptions := utils.GetListOptions(ctx) listOptions := utils.GetListOptions(ctx)
publicOrgs, maxResults, err := models.SearchUsers(&models.SearchUserOptions{ publicOrgs, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
Actor: ctx.User,
ListOptions: listOptions, ListOptions: listOptions,
Type: models.UserTypeOrganization, Type: models.UserTypeOrganization,
OrderBy: models.SearchOrderByAlphabetically, OrderBy: models.SearchOrderByAlphabetically,

6
routers/api/v1/user/user.go
View file

@ -56,15 +56,13 @@ func Search(ctx *context.APIContext) {
listOptions := utils.GetListOptions(ctx) listOptions := utils.GetListOptions(ctx)
opts := &models.SearchUserOptions{ users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
Actor: ctx.User, Actor: ctx.User,
Keyword: strings.Trim(ctx.Query("q"), " "), Keyword: strings.Trim(ctx.Query("q"), " "),
UID: ctx.QueryInt64("uid"), UID: ctx.QueryInt64("uid"),
Type: models.UserTypeIndividual, Type: models.UserTypeIndividual,
ListOptions: listOptions, ListOptions: listOptions,
} })
users, maxResults, err := models.SearchUsers(opts)
if err != nil { if err != nil {
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
"ok": false, "ok": false,