ami/tl-vikunja
1
0
Fork 0
Code Activity

fix: rename incorrectly named ProjectUsers method

Browse Source
This commit is contained in:
kolaente
2022-11-13 17:43:45 +01:00
parent 8f4abd2fe8
commit 7e53a21407
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/models/user_project.go
View File

@ -32,8 +32,8 @@ type ProjectUIDs struct {
TeamProjectUserID int64 `xorm:"tlUID"`
}
// ProjectUsersFromProject returns a project with all users who have access to a project, regardless of the method which gave them access
func ProjectUsersFromProject(s *xorm.Session, l *Project, search string) (users []*user.User, err error) {
// ListUsersFromProject returns a list with all users who have access to a project, regardless of the method which gave them access
func ListUsersFromProject(s *xorm.Session, l *Project, search string) (users []*user.User, err error) {
userids := []*ProjectUIDs{}
@ -102,7 +102,7 @@ func ProjectUsersFromProject(s *xorm.Session, l *Project, search string) (users
cond = builder.In("id", uids)
}
users, err = user.ProjectUsers(s, search, &user.ProjectUserOpts{
users, err = user.ListUsers(s, search, &user.ProjectUserOpts{
AdditionalCond: cond,
ReturnAllIfNoSearchProvided: true,
})

4
pkg/models/user_project_test.go
View File

@ -228,9 +228,9 @@ func TestProjectUsersFromProject(t *testing.T) {
s := db.NewSession()
defer s.Close()
gotUsers, err := ProjectUsersFromProject(s, tt.args.l, tt.args.search)
gotUsers, err := ListUsersFromProject(s, tt.args.l, tt.args.search)
if (err != nil) != tt.wantErr {
t.Errorf("ProjectUsersFromProject() error = %v, wantErr %v", err, tt.wantErr)
t.Errorf("ListUsersFromProject() error = %v, wantErr %v", err, tt.wantErr)
return
}
if diff, equal := messagediff.PrettyDiff(tt.wantUsers, gotUsers); !equal {