From 1bc43ec2bc2282d9e18ca622444d45f09c1b6378 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 21 Nov 2017 18:37:08 -0800 Subject: Improve Context to be more idiomatic --- server/ui/controller/subscription.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/ui/controller/subscription.go') diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index a9473bdc..22ec6859 100644 --- a/server/ui/controller/subscription.go +++ b/server/ui/controller/subscription.go @@ -13,7 +13,7 @@ import ( ) func (c *Controller) AddSubscription(ctx *core.Context, request *core.Request, response *core.Response) { - user := ctx.GetLoggedUser() + user := ctx.LoggedUser() args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { @@ -25,7 +25,7 @@ func (c *Controller) AddSubscription(ctx *core.Context, request *core.Request, r } func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request, response *core.Response) { - user := ctx.GetLoggedUser() + user := ctx.LoggedUser() args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { @@ -71,7 +71,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request return } - response.Redirect(ctx.GetRoute("feedEntries", "feedID", feed.ID)) + response.Redirect(ctx.Route("feedEntries", "feedID", feed.ID)) case n > 1: response.HTML().Render("choose_subscription", args.Merge(tplParams{ "categoryID": subscriptionForm.CategoryID, @@ -81,7 +81,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request } func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request, response *core.Response) { - user := ctx.GetLoggedUser() + user := ctx.LoggedUser() args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { @@ -107,7 +107,7 @@ func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request return } - response.Redirect(ctx.GetRoute("feedEntries", "feedID", feed.ID)) + response.Redirect(ctx.Route("feedEntries", "feedID", feed.ID)) } func (c *Controller) getSubscriptionFormTemplateArgs(ctx *core.Context, user *model.User) (tplParams, error) { -- cgit v1.2.3