6 files changed, 27 insertions, 6 deletions
diff --git a/server/static/bin.go b/server/static/bin.go
index af1c085..dc411fa 100644
--- a/server/static/bin.go
+++ b/server/static/bin.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-11-21 14:38:46.651098874 -0800 PST m=+0.002920446
+// 2017-11-21 14:55:14.42928305 -0800 PST m=+0.010828954
 
 package static
 
diff --git a/server/static/css.go b/server/static/css.go
index e632be5..e2d14e3 100644
--- a/server/static/css.go
+++ b/server/static/css.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-11-21 14:38:46.651532115 -0800 PST m=+0.003353687
+// 2017-11-21 14:55:14.43289693 -0800 PST m=+0.014442834
 
 package static
 
diff --git a/server/static/js.go b/server/static/js.go
index 2a9ed37..f6e8970 100644
--- a/server/static/js.go
+++ b/server/static/js.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-11-21 14:38:46.652422004 -0800 PST m=+0.004243576
+// 2017-11-21 14:55:14.43700259 -0800 PST m=+0.018548494
 
 package static
 
diff --git a/server/template/common.go b/server/template/common.go
index 24e2a97..8c6db15 100644
--- a/server/template/common.go
+++ b/server/template/common.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-11-21 14:38:46.654164863 -0800 PST m=+0.005986435
+// 2017-11-21 14:55:14.455330256 -0800 PST m=+0.036876160
 
 package template
 
diff --git a/server/template/views.go b/server/template/views.go
index c9d845e..0611d6c 100644
--- a/server/template/views.go
+++ b/server/template/views.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2017-11-21 14:38:46.652925155 -0800 PST m=+0.004746727
+// 2017-11-21 14:55:14.438565193 -0800 PST m=+0.020111097
 
 package template
 
diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go
index dbc8067..48c77c3 100644
--- a/server/ui/controller/category.go
+++ b/server/ui/controller/category.go
@@ -6,10 +6,11 @@ package controller
 
 import (
 	"errors"
+	"log"
+
 	"github.com/miniflux/miniflux2/model"
 	"github.com/miniflux/miniflux2/server/core"
 	"github.com/miniflux/miniflux2/server/ui/form"
-	"log"
 )
 
 func (c *Controller) ShowCategories(ctx *core.Context, request *core.Request, response *core.Response) {
@@ -104,6 +105,19 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp
 		return
 	}
 
+	duplicateCategory, err := c.store.GetCategoryByTitle(user.ID, categoryForm.Title)
+	if err != nil {
+		response.Html().ServerError(err)
+		return
+	}
+
+	if duplicateCategory != nil {
+		response.Html().Render("create_category", args.Merge(tplParams{
+			"errorMessage": "This category already exists.",
+		}))
+		return
+	}
+
 	category := model.Category{Title: categoryForm.Title, UserID: user.ID}
 	err = c.store.CreateCategory(&category)
 	if err != nil {
@@ -158,6 +172,13 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re
 		return
 	}
 
+	if c.store.AnotherCategoryExists(user.ID, category.ID, categoryForm.Title) {
+		response.Html().Render("edit_category", args.Merge(tplParams{
+			"errorMessage": "This category already exists.",
+		}))
+		return
+	}
+
 	err = c.store.UpdateCategory(categoryForm.Merge(category))
 	if err != nil {
 		log.Println(err)