diff options
| author |  Frédéric Guillot <fred@miniflux.net>
| 2017-11-21 18:30:16 -0800 |
|---|---|---|
| committer | Frédéric Guillot <fred@miniflux.net>
| 2017-11-21 18:30:16 -0800 |
| commit | 02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e (patch) | |
| tree | 236d95c147453fcdeacd92cdc17fd886d664c1b0 /server/ui/controller/subscription.go | |
| parent | 25cbd657771a67ef41abac4089a231369b96276e (diff) | |
| download | v2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.tar.gz v2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.tar.zst v2-02ff7b4bcf2b2c691e55ae61fe97bfd9ae37658e.zip | |
Improve Response to be more idiomatic
Diffstat (limited to 'server/ui/controller/subscription.go')
| -rw-r--r-- | server/ui/controller/subscription.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index 88fa077a..a9473bdc 100644 --- a/server/ui/controller/subscription.go +++ b/server/ui/controller/subscription.go @@ -17,11 +17,11 @@ func (c *Controller) AddSubscription(ctx *core.Context, request *core.Request, r args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("add_subscription", args) + response.HTML().Render("add_subscription", args) } func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request, response *core.Response) { @@ -29,13 +29,13 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -45,7 +45,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request subscriptions, err := subscription.FindSubscriptions(subscriptionForm.URL) if err != nil { log.Println(err) - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -57,14 +57,14 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request n := len(subscriptions) switch { case n == 0: - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": "Unable to find any subscription.", })) case n == 1: feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptions[0].URL) if err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -73,7 +73,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request response.Redirect(ctx.GetRoute("feedEntries", "feedID", feed.ID)) case n > 1: - response.Html().Render("choose_subscription", args.Merge(tplParams{ + response.HTML().Render("choose_subscription", args.Merge(tplParams{ "categoryID": subscriptionForm.CategoryID, "subscriptions": subscriptions, })) @@ -85,13 +85,13 @@ func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -100,7 +100,7 @@ func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptionForm.URL) if err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) |