oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

Improve Response to be more idiomatic

Browse source
This commit is contained in:
Frédéric Guillot 2017-11-21 18:30:16 -08:00
parent 25cbd65777
commit 02ff7b4bcf
25 changed files with 302 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/ui/controller/subscription.go
View file

@ -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,
}))