From 1f58b37a5e86603b16e137031c36f37580e9d410 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 7 Oct 2018 18:42:43 -0700 Subject: Refactor HTTP response builder --- ui/user_remove.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'ui/user_remove.go') diff --git a/ui/user_remove.go b/ui/user_remove.go index 981a7a2..beda7be 100644 --- a/ui/user_remove.go +++ b/ui/user_remove.go @@ -8,7 +8,6 @@ import ( "net/http" "miniflux.app/http/request" - "miniflux.app/http/response" "miniflux.app/http/response/html" "miniflux.app/http/route" ) @@ -17,31 +16,31 @@ import ( func (c *Controller) RemoveUser(w http.ResponseWriter, r *http.Request) { user, err := c.store.UserByID(request.UserID(r)) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } if !user.IsAdmin { - html.Forbidden(w) + html.Forbidden(w, r) return } userID := request.RouteInt64Param(r, "userID") selectedUser, err := c.store.UserByID(userID) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } if selectedUser == nil { - html.NotFound(w) + html.NotFound(w, r) return } if err := c.store.RemoveUser(selectedUser.ID); err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } - response.Redirect(w, r, route.Path(c.router, "users")) + html.Redirect(w, r, route.Path(c.router, "users")) } -- cgit v1.2.3