From 85d9fe6f793ab8deec7cee1333d92965039b091e Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 2 May 2024 14:27:45 +0800
Subject: [PATCH] Revert "Use json return but not 500 directly"

This reverts commit 81d455fa6cd22994ee99eb819f13e2b10fc2e874.
---
 routers/web/repo/projects.go | 32 ++++++++++++++++----------------
 services/context/context.go  | 12 ------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
index f7de4c9b21..6cd932d76a 100644
--- a/routers/web/repo/projects.go
+++ b/routers/web/repo/projects.go
@@ -380,11 +380,11 @@ func UpdateIssueProject(ctx *context.Context) {
 	}
 
 	if err := issues.LoadProjects(ctx); err != nil {
-		ctx.JSONServerError("Load projects failed", err)
+		ctx.ServerError("LoadProjects", err)
 		return
 	}
 	if _, err := issues.LoadRepositories(ctx); err != nil {
-		ctx.JSONServerError("Load repositories failed", err)
+		ctx.ServerError("LoadProjects", err)
 		return
 	}
 
@@ -393,18 +393,18 @@ func UpdateIssueProject(ctx *context.Context) {
 	if projectID > 0 {
 		dstProject, err := project_model.GetProjectByID(ctx, projectID)
 		if err != nil {
-			ctx.JSONServerError("Get project failed", err)
+			ctx.ServerError("GetProjectByID", err)
 			return
 		}
 		for _, issue := range issues {
 			if dstProject.RepoID != ctx.Repo.Repository.ID && dstProject.OwnerID != issue.Repo.OwnerID {
-				ctx.JSON(http.StatusBadRequest, "project doesn't belong to the repository")
+				ctx.Error(http.StatusBadRequest, "project doesn't belong to the repository")
 				return
 			}
 		}
 		dstDefaultColumn, err := dstProject.GetDefaultBoard(ctx)
 		if err != nil {
-			ctx.JSONServerError("Get default board failed", err)
+			ctx.ServerError("GetDefaultBoard", err)
 			return
 		}
 		dstColumnID = dstDefaultColumn.ID
@@ -418,7 +418,7 @@ func UpdateIssueProject(ctx *context.Context) {
 		}
 
 		if err := issues_model.ChangeProjectAssign(ctx, issue, ctx.Doer, projectID, dstColumnID); err != nil {
-			ctx.JSONServerError("Change project assign failed", err)
+			ctx.ServerError("ChangeProjectAssign", err)
 			return
 		}
 	}
@@ -445,16 +445,16 @@ func DeleteProjectBoard(ctx *context.Context) {
 	project, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if project_model.IsErrProjectNotExist(err) {
-			ctx.JSONServerError("Project doesn't exist", err)
+			ctx.NotFound("", nil)
 		} else {
-			ctx.JSONServerError("Get project failed", err)
+			ctx.ServerError("GetProjectByID", err)
 		}
 		return
 	}
 
 	pb, err := project_model.GetBoard(ctx, ctx.ParamsInt64(":boardID"))
 	if err != nil {
-		ctx.JSONServerError("Get project board failed", err)
+		ctx.ServerError("GetProjectBoard", err)
 		return
 	}
 	if pb.ProjectID != ctx.ParamsInt64(":id") {
@@ -472,7 +472,7 @@ func DeleteProjectBoard(ctx *context.Context) {
 	}
 
 	if err := project_model.DeleteBoardByID(ctx, ctx.ParamsInt64(":boardID")); err != nil {
-		ctx.JSONServerError("Delete project board failed", err)
+		ctx.ServerError("DeleteProjectBoardByID", err)
 		return
 	}
 
@@ -492,9 +492,9 @@ func AddBoardToProjectPost(ctx *context.Context) {
 	project, err := project_model.GetProjectForRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if project_model.IsErrProjectNotExist(err) {
-			ctx.JSONServerError("Project doesn't exist", err)
+			ctx.NotFound("", nil)
 		} else {
-			ctx.JSONServerError("Get project failed", err)
+			ctx.ServerError("GetProjectByID", err)
 		}
 		return
 	}
@@ -505,7 +505,7 @@ func AddBoardToProjectPost(ctx *context.Context) {
 		Color:     form.Color,
 		CreatorID: ctx.Doer.ID,
 	}); err != nil {
-		ctx.JSONServerError("create project board failed", err)
+		ctx.ServerError("NewProjectBoard", err)
 		return
 	}
 
@@ -530,16 +530,16 @@ func checkProjectBoardChangePermissions(ctx *context.Context) (*project_model.Pr
 	project, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if project_model.IsErrProjectNotExist(err) {
-			ctx.JSONServerError("Project doesn't exist", err)
+			ctx.NotFound("", nil)
 		} else {
-			ctx.JSONServerError("Get project failed", err)
+			ctx.ServerError("GetProjectByID", err)
 		}
 		return nil, nil
 	}
 
 	board, err := project_model.GetBoard(ctx, ctx.ParamsInt64(":boardID"))
 	if err != nil {
-		ctx.JSONServerError("Get project board failed", err)
+		ctx.ServerError("GetProjectBoard", err)
 		return nil, nil
 	}
 	if board.ProjectID != ctx.ParamsInt64(":id") {
diff --git a/services/context/context.go b/services/context/context.go
index 723d58d165..aab0485f1a 100644
--- a/services/context/context.go
+++ b/services/context/context.go
@@ -20,7 +20,6 @@ import (
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/httpcache"
-	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/session"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/templates"
@@ -268,14 +267,3 @@ func (ctx *Context) JSONError(msg any) {
 		panic(fmt.Sprintf("unsupported type: %T", msg))
 	}
 }
-
-func (ctx *Context) JSONServerError(msg string, err error) {
-	errorMessage := msg
-	if err != nil {
-		log.Log(1, log.ERROR, "%s: %v", msg, err)
-		if ctx.Doer != nil && ctx.Doer.IsAdmin {
-			errorMessage = fmt.Sprintf("%s: %v", errorMessage, err)
-		}
-	}
-	ctx.JSON(http.StatusBadRequest, map[string]any{"errorMessage": errorMessage, "renderFormat": "text"})
-}