davrot/forgejo-aneksajo
1
0
Fork 0
mirror of https://codeberg.org/forgejo-aneksajo/forgejo-aneksajo.git synced 2025-07-10 11:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move login related structs and functions to models/login (#17093)

Browse source 
* Move login related structs and functions to models/login

* Fix test

* Fix lint

* Fix lint

* Fix lint of windows

* Fix lint

* Fix test

* Fix test

* Only load necessary fixtures when preparing unit tests envs

* Fix lint

* Fix test

* Fix test

* Fix error log

* Fix error log

* Fix error log

* remove unnecessary change

* fix error log

* merge main branch
This commit is contained in:
Lunny Xiao 2021-09-24 19:32:56 +08:00 • committed by GitHub
parent 4a2655098f
commit 5842a55b31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 1050 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/org.go
View file

@ -78,7 +78,7 @@ func (org *User) GetMembers() (err error) {
// FindOrgMembersOpts represensts find org members conditions
type FindOrgMembersOpts struct {
ListOptions
db.ListOptions
OrgID int64
PublicOnly bool
}
@ -574,7 +574,7 @@ func GetOrgUsersByUserID(uid int64, opts *SearchOrganizationsOptions) ([]*OrgUse
}
if opts.PageSize != 0 {
sess = setSessionPagination(sess, opts)
sess = db.SetSessionPagination(sess, opts)
}
err := sess.
@ -594,7 +594,7 @@ func getOrgUsersByOrgID(e db.Engine, opts *FindOrgMembersOpts) ([]*OrgUser, erro
sess.And("is_public = ?", true)
}
if opts.ListOptions.PageSize > 0 {
sess = setSessionPagination(sess, opts)
sess = db.SetSessionPagination(sess, opts)
ous := make([]*OrgUser, 0, opts.PageSize)
return ous, sess.Find(&ous)