ami/tl-vikunja
1
0
Fork 0
Code Activity

Implemented CanUpdate method

Browse Source
This commit is contained in:
konrad
2018-07-12 23:07:03 +02:00
committed by kolaente
parent e3b996c383
commit 6fd2a97574
10 changed files with 54 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
models/list_items_create_update.go
View File

@ -5,30 +5,24 @@ func (i *ListItem) Create(doer *User, lID int64) (err error) {
i.ListID = lID
i.ID = 0
return createOrUpdateListItem(i, doer, lID)
return createOrUpdateListItem(i, doer)
}
// Update updates a list item
func (i *ListItem) Update(ID int64, doer *User) (err error) {
func (i *ListItem) Update(ID int64) (err error) {
i.ID = ID
// Get the full item
fullItem, err := GetListItemByID(ID)
// Check if the item exists
_, err = GetListItemByID(ID)
if err != nil {
return
}
return createOrUpdateListItem(i, doer, fullItem.ListID)
return createOrUpdateListItem(i, &User{})
}
// Helper function for creation or updating of new lists as both methods share most of their logic
func createOrUpdateListItem(i *ListItem, doer *User, lID int64) (err error) {
// Check rights
user, err := listItemPreCheck(i, doer, lID)
if err != nil {
return
}
func createOrUpdateListItem(i *ListItem, doer *User) (err error) {
// Check if we have at least a text
if i.Text == "" {
@ -39,6 +33,11 @@ func createOrUpdateListItem(i *ListItem, doer *User, lID int64) (err error) {
if i.ID != 0 {
_, err = x.ID(i.ID).Update(i)
} else {
user, _, err := GetUserByID(doer.ID)
if err != nil {
return err
}
i.CreatedByID = user.ID
i.CreatedBy = user
_, err = x.Insert(i)
@ -46,25 +45,3 @@ func createOrUpdateListItem(i *ListItem, doer *User, lID int64) (err error) {
return
}
// This helper function checks if the user has the right to edit a list item.
// It is used in Create/Update/Delete.
func listItemPreCheck(i *ListItem, doer *User, lID int64) (user User, err error) {
// Check rights
user, _, err = GetUserByID(doer.ID)
if err != nil {
return
}
// Get the list to check if the user has the right to write to that list
list, err := GetListByID(lID) // TODO: Get the list with one query by item ID
if err != nil {
return
}
if !list.CanWrite(&user) {
return user, ErrNeedToBeListWriter{ListID: i.ListID, UserID: user.ID}
}
return
}