local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

/lists/{listID}/teams now also returns the user right

Browse source
This commit is contained in:
kolaente 2018-09-17 19:45:18 +02:00
parent cf6577445d
commit 0a06e5a246
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/team_list.go
View file

@ -18,3 +18,8 @@ type TeamList struct {
func (TeamList) TableName() string { func (TeamList) TableName() string {
return "team_list" return "team_list"
} }
type teamWithRight struct {
Team `xorm:"extends"`
Right TeamRight `json:"right"`
}

5
models/team_list_readall.go
View file

@ -12,9 +12,8 @@ func (tl *TeamList) ReadAll(user *User) (interface{}, error) {
} }
// Get the teams // Get the teams
all := []*Team{} all := []*teamWithRight{}
err = x.
err = x.Select("teams.*").
Table("teams"). Table("teams").
Join("INNER", "team_list", "team_id = teams.id"). Join("INNER", "team_list", "team_id = teams.id").
Where("team_list.list_id = ?", tl.ListID). Where("team_list.list_id = ?", tl.ListID).