mirror of
https://gitcode.com/gitea/gitea.git
synced 2025-07-04 03:37:01 +08:00
Move organization related structs into sub package (#18518)
* Move organization related structs into sub package * Fix test * Fix lint * Move more functions into sub packages * Fix bug * Fix test * Update models/organization/team_repo.go Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Apply suggestions from code review Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Fix fmt * Follow suggestion from @Gusted * Fix test * Fix test * Fix bug * Use ctx but db.DefaultContext on routers * Fix bug * Fix bug * fix bug * Update models/organization/team_user.go * Fix bug Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
integrations
models
access.goaccess_test.goaction.gobranches.goerror.go
fixtures
issue.goissue_comment.gomain_test.gonotification.goorg.goorg_team.goorg_team_test.goorg_test.goorganization
main_test.goorg.goorg_test.goorg_user.goorg_user_test.goteam.goteam_repo.goteam_test.goteam_unit.goteam_user.go
protected_tag.gorepo.gorepo
repo_collaboration.gorepo_permission.gorepo_permission_test.gorepo_transfer.goreview.gostatistic.gouser.gouser
user_heatmap.gouser_test.gouserlist.gouserlist_test.gomodules
routers
services
auth/source/ldap
issue
mailer
org
repository
user
@ -10,6 +10,7 @@ import (
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
"code.gitea.io/gitea/models/organization"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
@ -36,11 +37,11 @@ func TestDeleteUser(t *testing.T) {
|
||||
return
|
||||
}
|
||||
|
||||
orgUsers := make([]*models.OrgUser, 0, 10)
|
||||
assert.NoError(t, db.GetEngine(db.DefaultContext).Find(&orgUsers, &models.OrgUser{UID: userID}))
|
||||
orgUsers := make([]*organization.OrgUser, 0, 10)
|
||||
assert.NoError(t, db.GetEngine(db.DefaultContext).Find(&orgUsers, &organization.OrgUser{UID: userID}))
|
||||
for _, orgUser := range orgUsers {
|
||||
if err := models.RemoveOrgUser(orgUser.OrgID, orgUser.UID); err != nil {
|
||||
assert.True(t, models.IsErrLastOrgOwner(err))
|
||||
assert.True(t, organization.IsErrLastOrgOwner(err))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user