ami/tl-vikunja
1
0
Fork 0
Code Activity

Use the auth methods to get IDs to avoid unneeded casts

Browse Source
This commit is contained in:
kolaente
2019-06-28 10:21:48 +02:00
parent fc3c5f2187
commit f1d21ea52b
25 changed files with 65 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/models/label_task.go
View File

@ -108,11 +108,6 @@ func (lt *LabelTask) Create(a web.Auth) (err error) {
// @Failure 500 {object} models.Message "Internal error"
// @Router /tasks/{task}/labels [get]
func (lt *LabelTask) ReadAll(search string, a web.Auth, page int) (labels interface{}, err error) {
u, err := getUserWithError(a)
if err != nil {
return nil, err
}
// Check if the user has the right to see the task
task := ListTask{ID: lt.TaskID}
canRead, err := task.CanRead(a)
@ -120,11 +115,11 @@ func (lt *LabelTask) ReadAll(search string, a web.Auth, page int) (labels interf
return nil, err
}
if !canRead {
return nil, ErrNoRightToSeeTask{lt.TaskID, u.ID}
return nil, ErrNoRightToSeeTask{lt.TaskID, a.GetID()}
}
return getLabelsByTaskIDs(&LabelByTaskIDsOptions{
User: u,
User: &User{ID: a.GetID()},
Search: search,
Page: page,
TaskIDs: []int64{lt.TaskID},