diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-28 22:11:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 22:11:58 +0800 |
| commit | 9defddb2862aa0a54da21328ca091284291363f7 (patch) | |
| tree | 1126670579198f00d89c8a4f0240aa7d99995eb8 /models/org.go | |
| parent | b1df89095163d8ce3eecfeb855e7f03f17b473c4 (diff) | |
| download | gitea-9defddb2862aa0a54da21328ca091284291363f7.tar.gz gitea-9defddb2862aa0a54da21328ca091284291363f7.zip | |
Move more model into models/user (#17826)
* Move more model into models/user
* Remove unnecessary comment
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models/org.go')
| -rw-r--r-- | models/org.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/org.go b/models/org.go index 040d129692..becfa4cb05 100644 --- a/models/org.go +++ b/models/org.go @@ -81,7 +81,7 @@ func (org *Organization) LoadTeams() ([]*Team, error) { } // GetMembers returns all members of organization. -func (org *Organization) GetMembers() (UserList, map[int64]bool, error) { +func (org *Organization) GetMembers() (user_model.UserList, map[int64]bool, error) { return FindOrgMembers(&FindOrgMembersOpts{ OrgID: org.ID, }) @@ -149,7 +149,7 @@ func CountOrgMembers(opts *FindOrgMembersOpts) (int64, error) { } // FindOrgMembers loads organization members according conditions -func FindOrgMembers(opts *FindOrgMembersOpts) (UserList, map[int64]bool, error) { +func FindOrgMembers(opts *FindOrgMembersOpts) (user_model.UserList, map[int64]bool, error) { ous, err := GetOrgUsersByOrgID(opts) if err != nil { return nil, nil, err @@ -162,7 +162,7 @@ func FindOrgMembers(opts *FindOrgMembersOpts) (UserList, map[int64]bool, error) idsIsPublic[ou.UID] = ou.IsPublic } - users, err := GetUsersByIDs(ids) + users, err := user_model.GetUsersByIDs(ids) if err != nil { return nil, nil, err } |