From e3b996c3833cbd06d882474dec77662f4b4439e3 Mon Sep 17 00:00:00 2001 From: konrad Date: Thu, 12 Jul 2018 22:42:41 +0200 Subject: [PATCH] Cleanup --- models/crudable.go | 2 +- models/list_delete.go | 2 +- models/list_items_delete.go | 2 +- routes/crud/delete.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/crudable.go b/models/crudable.go index 0a85b6ae68d..90d0bb27b79 100644 --- a/models/crudable.go +++ b/models/crudable.go @@ -6,5 +6,5 @@ type CRUDable interface { ReadOne(int64) error ReadAll(*User) (interface{}, error) Update(int64, *User) error - Delete(int64, *User) error + Delete(int64) error } diff --git a/models/list_delete.go b/models/list_delete.go index c7472dababa..e2f41f224f1 100644 --- a/models/list_delete.go +++ b/models/list_delete.go @@ -1,7 +1,7 @@ package models // Delete implements the delete method of CRUDable -func (l *List) Delete(id int64, doer *User) (err error) { +func (l *List) Delete(id int64) (err error) { // Check if the list exists _, err = GetListByID(id) if err != nil { diff --git a/models/list_items_delete.go b/models/list_items_delete.go index e8b0dbb4218..7658a8980f1 100644 --- a/models/list_items_delete.go +++ b/models/list_items_delete.go @@ -1,7 +1,7 @@ package models // Delete implements the delete method for listItem -func (i *ListItem) Delete(id int64, doer *User) (err error) { +func (i *ListItem) Delete(id int64) (err error) { // Check if it exists _, err = GetListItemByID(id) diff --git a/routes/crud/delete.go b/routes/crud/delete.go index d159f001123..1cd0682389d 100644 --- a/routes/crud/delete.go +++ b/routes/crud/delete.go @@ -23,7 +23,7 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error { return echo.NewHTTPError(http.StatusForbidden) } - err = c.CObject.Delete(id, &user) + err = c.CObject.Delete(id) if err != nil { if models.IsErrNeedToBeListAdmin(err) { return echo.NewHTTPError(http.StatusForbidden, "You need to be the list admin to delete a list.")