From 104344a916e46266b7085c5a542089859d87439d Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 17 Mar 2023 02:40:33 +0000 Subject: [PATCH 1/8] add unset default project board --- options/locale/locale_en-US.ini | 2 ++ routers/web/org/projects.go | 17 +++++++++++++++++ routers/web/web.go | 1 + templates/projects/view.tmpl | 20 ++++++++++++++++++++ web_src/js/features/repo-projects.js | 15 +++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index da925a27f5d3..76d7ab61c1b0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1228,6 +1228,8 @@ projects.column.new_submit = "Create Column" projects.column.new = "New Column" projects.column.set_default = "Set Default" projects.column.set_default_desc = "Set this column as default for uncategorized issues and pulls" +projects.column.unset_default = "Unset Default" +projects.column.unset_default_desc = "Unset this column as default" projects.column.delete = "Delete Column" projects.column.deletion_desc = "Deleting a project column moves all related issues to 'Uncategorized'. Continue?" projects.column.color = "Color" diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index c9d63fec5df0..9f41fd1449ce 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -573,6 +573,23 @@ func SetDefaultProjectBoard(ctx *context.Context) { }) } +// UnsetDefaultProjectBoard unset default board for uncategorized issues/pulls +func UnsetDefaultProjectBoard(ctx *context.Context) { + project, _ := CheckProjectBoardChangePermissions(ctx) + if ctx.Written() { + return + } + + if err := project_model.SetDefaultBoard(project.ID, 0); err != nil { + ctx.ServerError("SetDefaultBoard", err) + return + } + + ctx.JSON(http.StatusOK, map[string]interface{}{ + "ok": true, + }) +} + // MoveIssues moves or keeps issues in a column and sorts them inside that column func MoveIssues(ctx *context.Context) { if ctx.Doer == nil { diff --git a/routers/web/web.go b/routers/web/web.go index 292268dc8055..50b83200809d 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -907,6 +907,7 @@ func RegisterRoutes(m *web.Route) { m.Put("", web.Bind(forms.EditProjectBoardForm{}), org.EditProjectBoard) m.Delete("", org.DeleteProjectBoard) m.Post("/default", org.SetDefaultProjectBoard) + m.Post("/unsetdefault", org.UnsetDefaultProjectBoard) m.Post("/move", org.MoveIssues) }) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index b776f89efa39..ac7fa6155861 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -99,6 +99,11 @@ {{svg "octicon-pin"}} {{$.locale.Tr "repo.projects.column.set_default"}} + {{else}} + + {{svg "octicon-pin"}} + {{$.locale.Tr "repo.projects.column.unset_default"}} + {{end}} {{svg "octicon-trash"}} @@ -149,6 +154,21 @@ + + + + - + - -