Simplify org labels route changes

kemzeb · kemzeb · commit e76508a584cc · 2025-06-06T14:14:38.000-07:00
diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go
@@ -54,11 +54,11 @@ func NewLabel(ctx *context.Context) {
 	if err := issues_model.NewLabel(ctx, l); err != nil {
 		if label.IsErrInvalidLabelColor(err) {
 			ctx.Flash.Error(err.Error())
-			ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")
 		} else {
 			ctx.ServerError("NewLabel", err)
+			return
 		}
-		return
+
 	}
 	ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")
 }
@@ -86,11 +86,11 @@ func UpdateLabel(ctx *context.Context) {
 	if err := issues_model.UpdateLabel(ctx, l); err != nil {
 		if label.IsErrInvalidLabelColor(err) {
 			ctx.Flash.Error(err.Error())
-			ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")
 		} else {
 			ctx.ServerError("UpdateLabel", err)
+			return
 		}
-		return
+
 	}
 	ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")
 }

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ func NewLabel(ctx *context.Context) {`
`54`	`54`	`if err := issues_model.NewLabel(ctx, l); err != nil {`
`55`	`55`	`if label.IsErrInvalidLabelColor(err) {`
`56`	`56`	`ctx.Flash.Error(err.Error())`
`57`		`- ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")`
`58`	`57`	`} else {`
`59`	`58`	`ctx.ServerError("NewLabel", err)`
	`59`	`+ return`
`60`	`60`	`}`
`61`		`- return`
	`61`	`+`
`62`	`62`	`}`
`63`	`63`	`ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")`
`64`	`64`	`}`
`@@ -86,11 +86,11 @@ func UpdateLabel(ctx *context.Context) {`
`86`	`86`	`if err := issues_model.UpdateLabel(ctx, l); err != nil {`
`87`	`87`	`if label.IsErrInvalidLabelColor(err) {`
`88`	`88`	`ctx.Flash.Error(err.Error())`
`89`		`- ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")`
`90`	`89`	`} else {`
`91`	`90`	`ctx.ServerError("UpdateLabel", err)`
	`91`	`+ return`
`92`	`92`	`}`
`93`		`- return`
	`93`	`+`
`94`	`94`	`}`
`95`	`95`	`ctx.Redirect(ctx.Org.OrgLink + "/settings/labels")`
`96`	`96`	`}`