diff options
author | Frédéric Guillot <fred@miniflux.net> | 2018-09-03 14:26:40 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2018-09-03 14:26:40 -0700 |
commit | eee1f3190355224eef63a4dcdef8c36eb3ca3738 (patch) | |
tree | 009b7ca67b96d9be473d8ddf2c8c95f22a6749d1 /ui/category_update.go | |
parent | 88e81d4d800ff6433518522954197d75203a25c2 (diff) |
Refactor HTTP context handling
Diffstat (limited to 'ui/category_update.go')
-rw-r--r-- | ui/category_update.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/category_update.go b/ui/category_update.go index 892ad13..0553d97 100644 --- a/ui/category_update.go +++ b/ui/category_update.go @@ -7,7 +7,6 @@ package ui // import "miniflux.app/ui" import ( "net/http" - "miniflux.app/http/context" "miniflux.app/http/request" "miniflux.app/http/response" "miniflux.app/http/response/html" @@ -20,9 +19,7 @@ import ( // UpdateCategory validates and updates a category. func (c *Controller) UpdateCategory(w http.ResponseWriter, r *http.Request) { - ctx := context.New(r) - - user, err := c.store.UserByID(ctx.UserID()) + user, err := c.store.UserByID(request.UserID(r)) if err != nil { html.ServerError(w, err) return @@ -34,7 +31,7 @@ func (c *Controller) UpdateCategory(w http.ResponseWriter, r *http.Request) { return } - category, err := c.store.Category(ctx.UserID(), categoryID) + category, err := c.store.Category(request.UserID(r), categoryID) if err != nil { html.ServerError(w, err) return @@ -47,8 +44,8 @@ func (c *Controller) UpdateCategory(w http.ResponseWriter, r *http.Request) { categoryForm := form.NewCategoryForm(r) - sess := session.New(c.store, ctx) - view := view.New(c.tpl, ctx, sess) + sess := session.New(c.store, request.SessionID(r)) + view := view.New(c.tpl, r, sess) view.Set("form", categoryForm) view.Set("category", category) view.Set("menu", "categories") |