diff options
Diffstat (limited to 'server/ui/controller/category.go')
| -rw-r--r-- | server/ui/controller/category.go | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go index 6ac536bf..21e70fed 100644 --- a/server/ui/controller/category.go +++ b/server/ui/controller/category.go @@ -17,18 +17,18 @@ import ( func (c *Controller) ShowCategories(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } user := ctx.GetLoggedUser() categories, err := c.store.GetCategoriesWithFeedCount(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("categories", args.Merge(tplParams{ + response.HTML().Render("categories", args.Merge(tplParams{ "categories": categories, "total": len(categories), "menu": "categories", @@ -42,7 +42,7 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -61,17 +61,17 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques entries, err := builder.GetEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } count, err := builder.CountEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("category_entries", args.Merge(tplParams{ + response.HTML().Render("category_entries", args.Merge(tplParams{ "category": category, "entries": entries, "total": count, @@ -84,11 +84,11 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques func (c *Controller) CreateCategory(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "menu": "categories", })) } @@ -98,13 +98,13 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp user := ctx.GetLoggedUser() args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } categoryForm := form.NewCategoryForm(request.Request()) if err := categoryForm.Validate(); err != nil { - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": err.Error(), })) return @@ -112,12 +112,12 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp duplicateCategory, err := c.store.GetCategoryByTitle(user.ID, categoryForm.Title) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if duplicateCategory != nil { - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": "This category already exists.", })) return @@ -127,7 +127,7 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp err = c.store.CreateCategory(&category) if err != nil { log.Println(err) - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": "Unable to create this category.", })) return @@ -148,11 +148,11 @@ func (c *Controller) EditCategory(ctx *core.Context, request *core.Request, resp args, err := c.getCategoryFormTemplateArgs(ctx, user, category, nil) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("edit_category", args) + response.HTML().Render("edit_category", args) } // UpdateCategory validate and update a category. @@ -168,19 +168,19 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re categoryForm := form.NewCategoryForm(request.Request()) args, err := c.getCategoryFormTemplateArgs(ctx, user, category, categoryForm) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if err := categoryForm.Validate(); err != nil { - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": err.Error(), })) return } if c.store.AnotherCategoryExists(user.ID, category.ID, categoryForm.Title) { - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": "This category already exists.", })) return @@ -189,7 +189,7 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re err = c.store.UpdateCategory(categoryForm.Merge(category)) if err != nil { log.Println(err) - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": "Unable to update this category.", })) return @@ -208,7 +208,7 @@ func (c *Controller) RemoveCategory(ctx *core.Context, request *core.Request, re } if err := c.store.RemoveCategory(user.ID, category.ID); err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -218,19 +218,19 @@ func (c *Controller) RemoveCategory(ctx *core.Context, request *core.Request, re func (c *Controller) getCategoryFromURL(ctx *core.Context, request *core.Request, response *core.Response) (*model.Category, error) { categoryID, err := request.IntegerParam("categoryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return nil, err } user := ctx.GetLoggedUser() category, err := c.store.GetCategory(user.ID, categoryID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return nil, err } if category == nil { - response.Html().NotFound() + response.HTML().NotFound() return nil, errors.New("Category not found") } |