From d876464286d50067f3de5349d89b52cf6db0f74a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 16 Apr 2024 23:51:56 +0800 Subject: [PATCH] more renames --- models/project/column.go | 24 ++++++++++++------------ models/project/column_test.go | 2 +- models/project/issue.go | 4 ++-- models/project/project.go | 2 +- routers/web/org/projects.go | 8 ++++---- routers/web/org/projects_test.go | 2 +- routers/web/repo/projects.go | 22 +++++++++++----------- routers/web/repo/projects_test.go | 2 +- routers/web/web.go | 4 ++-- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/models/project/column.go b/models/project/column.go index 6636cb34d2..6e0ecdc4a9 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -56,17 +56,17 @@ func (Column) TableName() string { } // NumIssues return counter of all issues assigned to the column -func (b *Column) NumIssues(ctx context.Context) int { - c, err := db.GetEngine(ctx).Table("project_issue"). - Where("project_id=?", b.ProjectID). - And("project_board_id=?", b.ID). +func (c *Column) NumIssues(ctx context.Context) int { + total, err := db.GetEngine(ctx).Table("project_issue"). + Where("project_id=?", c.ProjectID). + And("project_board_id=?", c.ID). GroupBy("issue_id"). Cols("issue_id"). Count() if err != nil { return 0 } - return int(c) + return int(total) } func init() { @@ -113,9 +113,9 @@ func createDefaultColumnsForProject(ctx context.Context, project *Project) error return nil } - boards := make([]Column, 0, len(items)) + columns := make([]Column, 0, len(items)) for _, v := range items { - boards = append(boards, Column{ + columns = append(columns, Column{ CreatedUnix: timeutil.TimeStampNow(), CreatorID: project.CreatorID, Title: v, @@ -123,7 +123,7 @@ func createDefaultColumnsForProject(ctx context.Context, project *Project) error }) } - return db.Insert(ctx, boards) + return db.Insert(ctx, columns) }) } @@ -210,18 +210,18 @@ func UpdateColumn(ctx context.Context, column *Column) error { // GetColumns fetches all boards related to a project func (p *Project) GetColumns(ctx context.Context) (ColumnList, error) { - boards := make([]*Column, 0, 5) + columns := make([]*Column, 0, 5) - if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, false).OrderBy("sorting").Find(&boards); err != nil { + if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, false).OrderBy("sorting").Find(&columns); err != nil { return nil, err } - defaultB, err := p.getDefaultColumn(ctx) + defaultCol, err := p.getDefaultColumn(ctx) if err != nil { return nil, err } - return append([]*Column{defaultB}, boards...), nil + return append([]*Column{defaultCol}, columns...), nil } // getDefaultColumn return default column and ensure only one exists diff --git a/models/project/column_test.go b/models/project/column_test.go index 1babaea428..5001513984 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestGetDefaultcolumn(t *testing.T) { +func TestGetDefaultColumn(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) projectWithoutDefault, err := GetProjectByID(db.DefaultContext, 5) diff --git a/models/project/issue.go b/models/project/issue.go index 63352ed96c..b3bea4330f 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -102,7 +102,7 @@ func MoveIssuesOnProjectColumn(ctx context.Context, column *Column, sortedIssueI }) } -func (b *Column) removeIssues(ctx context.Context) error { - _, err := db.GetEngine(ctx).Exec("UPDATE `project_issue` SET project_board_id = 0 WHERE project_board_id = ? ", b.ID) +func (c *Column) removeIssues(ctx context.Context) error { + _, err := db.GetEngine(ctx).Exec("UPDATE `project_issue` SET project_board_id = 0 WHERE project_board_id = ? ", c.ID) return err } diff --git a/models/project/project.go b/models/project/project.go index 3cf6abc661..675cd1e861 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -92,7 +92,7 @@ type Project struct { Repo *repo_model.Repository `xorm:"-"` CreatorID int64 `xorm:"NOT NULL"` IsClosed bool `xorm:"INDEX"` - TemplateType TemplateType `xorm:"'board_type'"` + TemplateType TemplateType `xorm:"'board_type'"` // TODO: rename the column to template_type CardType CardType Type Type diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index b5c401046f..1d97a9b64e 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -473,7 +473,7 @@ func DeleteProjectColumn(ctx *context.Context) { return } - pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { ctx.ServerError("GetProjectColumn", err) return @@ -492,7 +492,7 @@ func DeleteProjectColumn(ctx *context.Context) { return } - if err := project_model.DeleteColumnByID(ctx, ctx.ParamsInt64(":boardID")); err != nil { + if err := project_model.DeleteColumnByID(ctx, ctx.ParamsInt64(":columnID")); err != nil { ctx.ServerError("DeleteProjectColumnByID", err) return } @@ -538,7 +538,7 @@ func CheckProjectColumnChangePermissions(ctx *context.Context) (*project_model.P return nil, nil } - column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { ctx.ServerError("GetProjectColumn", err) return nil, nil @@ -617,7 +617,7 @@ func MoveIssues(ctx *context.Context) { return } - column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { ctx.NotFoundOrServerError("GetProjectColumn", project_model.IsErrProjectColumnNotExist, err) return diff --git a/routers/web/org/projects_test.go b/routers/web/org/projects_test.go index cd28c6025b..ab419cc878 100644 --- a/routers/web/org/projects_test.go +++ b/routers/web/org/projects_test.go @@ -19,7 +19,7 @@ func TestCheckProjectColumnChangePermissions(t *testing.T) { contexttest.LoadUser(t, ctx, 2) ctx.ContextUser = ctx.Doer // user2 ctx.SetParams(":id", "4") - ctx.SetParams(":boardID", "4") + ctx.SetParams(":columnID", "4") project, column := org.CheckProjectColumnChangePermissions(ctx) assert.NotNil(t, project) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index fb83a094a0..7ef43c3350 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -36,7 +36,7 @@ const ( // MustEnableRepoProjects check if repo projects are enabled in settings func MustEnableRepoProjects(ctx *context.Context) { if unit.TypeProjects.UnitGlobalDisabled() { - ctx.NotFound("EnableKanbanBoard", nil) + ctx.NotFound("EnableRepoProjects", nil) return } @@ -309,15 +309,15 @@ func ViewProject(ctx *context.Context) { return } - boards, err := project.GetColumns(ctx) + columns, err := project.GetColumns(ctx) if err != nil { ctx.ServerError("GetProjectColumns", err) return } - issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, boards) + issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns) if err != nil { - ctx.ServerError("LoadIssuesOfBoards", err) + ctx.ServerError("LoadIssuesOfColumns", err) return } @@ -372,7 +372,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.Data["Project"] = project ctx.Data["IssuesMap"] = issuesMap - ctx.Data["Columns"] = boards // TODO: rename boards to columns in backend + ctx.Data["Columns"] = columns ctx.HTML(http.StatusOK, tplProjectsView) } @@ -432,7 +432,7 @@ func DeleteProjectColumn(ctx *context.Context) { return } - pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { ctx.ServerError("GetProjectColumn", err) return @@ -451,7 +451,7 @@ func DeleteProjectColumn(ctx *context.Context) { return } - if err := project_model.DeleteColumnByID(ctx, ctx.ParamsInt64(":boardID")); err != nil { + if err := project_model.DeleteColumnByID(ctx, ctx.ParamsInt64(":columnID")); err != nil { ctx.ServerError("DeleteProjectColumnByID", err) return } @@ -517,7 +517,7 @@ func checkProjectColumnChangePermissions(ctx *context.Context) (*project_model.P return nil, nil } - column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { ctx.ServerError("GetProjectColumn", err) return nil, nil @@ -570,7 +570,7 @@ func SetDefaultProjectColumn(ctx *context.Context) { } if err := project_model.SetDefaultColumn(ctx, project.ID, column.ID); err != nil { - ctx.ServerError("SetDefaultBoard", err) + ctx.ServerError("SetDefaultColumn", err) return } @@ -607,7 +607,7 @@ func MoveIssues(ctx *context.Context) { return } - column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) + column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID")) if err != nil { if project_model.IsErrProjectColumnNotExist(err) { ctx.NotFound("ProjectColumnNotExist", nil) @@ -618,7 +618,7 @@ func MoveIssues(ctx *context.Context) { } if column.ProjectID != project.ID { - ctx.NotFound("BoardNotInProject", nil) + ctx.NotFound("ColumnNotInProject", nil) return } diff --git a/routers/web/repo/projects_test.go b/routers/web/repo/projects_test.go index 11a17a2cce..d61230a57e 100644 --- a/routers/web/repo/projects_test.go +++ b/routers/web/repo/projects_test.go @@ -18,7 +18,7 @@ func TestCheckProjectColumnChangePermissions(t *testing.T) { contexttest.LoadUser(t, ctx, 2) contexttest.LoadRepo(t, ctx, 1) ctx.SetParams(":id", "1") - ctx.SetParams(":boardID", "2") + ctx.SetParams(":columnID", "2") project, column := checkProjectColumnChangePermissions(ctx) assert.NotNil(t, project) diff --git a/routers/web/web.go b/routers/web/web.go index 12a86fd8a5..243efc3888 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1004,7 +1004,7 @@ func registerRoutes(m *web.Route) { m.Post("/edit", web.Bind(forms.CreateProjectForm{}), org.EditProjectPost) m.Post("/{action:open|close}", org.ChangeProjectStatus) - m.Group("/{boardID}", func() { + m.Group("/{columnID}", func() { m.Put("", web.Bind(forms.EditProjectColumnForm{}), org.EditProjectColumn) m.Delete("", org.DeleteProjectColumn) m.Post("/default", org.SetDefaultProjectColumn) @@ -1343,7 +1343,7 @@ func registerRoutes(m *web.Route) { m.Post("/edit", web.Bind(forms.CreateProjectForm{}), repo.EditProjectPost) m.Post("/{action:open|close}", repo.ChangeProjectStatus) - m.Group("/{boardID}", func() { + m.Group("/{columnID}", func() { m.Put("", web.Bind(forms.EditProjectColumnForm{}), repo.EditProjectColumn) m.Delete("", repo.DeleteProjectColumn) m.Post("/default", repo.SetDefaultProjectColumn)