MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-09-26 19:19:00 +02:00
Code Issues Releases Wiki Activity

more renames

Browse source
This commit is contained in:
Lunny Xiao 2024-04-16 23:51:56 +08:00
parent 37eb84a0e0
commit d876464286
No known key found for this signature in database
GPG key ID: C3B7C91B632F738A
9 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
models/project/column.go
View file

@ -56,17 +56,17 @@ func (Column) TableName() string {
} }
// NumIssues return counter of all issues assigned to the column // NumIssues return counter of all issues assigned to the column
func (b *Column) NumIssues(ctx context.Context) int { func (c *Column) NumIssues(ctx context.Context) int {
c, err := db.GetEngine(ctx).Table("project_issue"). total, err := db.GetEngine(ctx).Table("project_issue").
Where("project_id=?", b.ProjectID). Where("project_id=?", c.ProjectID).
And("project_board_id=?", b.ID). And("project_board_id=?", c.ID).
GroupBy("issue_id"). GroupBy("issue_id").
Cols("issue_id"). Cols("issue_id").
Count() Count()
if err != nil { if err != nil {
return 0 return 0
} }
return int(c) return int(total)
} }
func init() { func init() {
@ -113,9 +113,9 @@ func createDefaultColumnsForProject(ctx context.Context, project *Project) error
return nil return nil
} }
boards := make([]Column, 0, len(items)) columns := make([]Column, 0, len(items))
for _, v := range items { for _, v := range items {
boards = append(boards, Column{ columns = append(columns, Column{
CreatedUnix: timeutil.TimeStampNow(), CreatedUnix: timeutil.TimeStampNow(),
CreatorID: project.CreatorID, CreatorID: project.CreatorID,
Title: v, 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 // GetColumns fetches all boards related to a project
func (p *Project) GetColumns(ctx context.Context) (ColumnList, error) { 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 return nil, err
} }
defaultB, err := p.getDefaultColumn(ctx) defaultCol, err := p.getDefaultColumn(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return append([]*Column{defaultB}, boards...), nil return append([]*Column{defaultCol}, columns...), nil
} }
// getDefaultColumn return default column and ensure only one exists // getDefaultColumn return default column and ensure only one exists

2
models/project/column_test.go
View file

@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestGetDefaultcolumn(t *testing.T) { func TestGetDefaultColumn(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase()) assert.NoError(t, unittest.PrepareTestDatabase())
projectWithoutDefault, err := GetProjectByID(db.DefaultContext, 5) projectWithoutDefault, err := GetProjectByID(db.DefaultContext, 5)

4
models/project/issue.go
View file

@ -102,7 +102,7 @@ func MoveIssuesOnProjectColumn(ctx context.Context, column *Column, sortedIssueI
}) })
} }
func (b *Column) removeIssues(ctx context.Context) error { 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 = ? ", b.ID) _, err := db.GetEngine(ctx).Exec("UPDATE `project_issue` SET project_board_id = 0 WHERE project_board_id = ? ", c.ID)
return err return err
} }

2
models/project/project.go
View file

@ -92,7 +92,7 @@ type Project struct {
Repo *repo_model.Repository `xorm:"-"` Repo *repo_model.Repository `xorm:"-"`
CreatorID int64 `xorm:"NOT NULL"` CreatorID int64 `xorm:"NOT NULL"`
IsClosed bool `xorm:"INDEX"` IsClosed bool `xorm:"INDEX"`
TemplateType TemplateType `xorm:"'board_type'"` TemplateType TemplateType `xorm:"'board_type'"` // TODO: rename the column to template_type
CardType CardType CardType CardType
Type Type Type Type

8
routers/web/org/projects.go
View file

@ -473,7 +473,7 @@ func DeleteProjectColumn(ctx *context.Context) {
return return
} }
pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
ctx.ServerError("GetProjectColumn", err) ctx.ServerError("GetProjectColumn", err)
return return
@ -492,7 +492,7 @@ func DeleteProjectColumn(ctx *context.Context) {
return 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) ctx.ServerError("DeleteProjectColumnByID", err)
return return
} }
@ -538,7 +538,7 @@ func CheckProjectColumnChangePermissions(ctx *context.Context) (*project_model.P
return nil, nil return nil, nil
} }
column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
ctx.ServerError("GetProjectColumn", err) ctx.ServerError("GetProjectColumn", err)
return nil, nil return nil, nil
@ -617,7 +617,7 @@ func MoveIssues(ctx *context.Context) {
return return
} }
column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
ctx.NotFoundOrServerError("GetProjectColumn", project_model.IsErrProjectColumnNotExist, err) ctx.NotFoundOrServerError("GetProjectColumn", project_model.IsErrProjectColumnNotExist, err)
return return

2
routers/web/org/projects_test.go
View file

@ -19,7 +19,7 @@ func TestCheckProjectColumnChangePermissions(t *testing.T) {
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
ctx.ContextUser = ctx.Doer // user2 ctx.ContextUser = ctx.Doer // user2
ctx.SetParams(":id", "4") ctx.SetParams(":id", "4")
ctx.SetParams(":boardID", "4") ctx.SetParams(":columnID", "4")
project, column := org.CheckProjectColumnChangePermissions(ctx) project, column := org.CheckProjectColumnChangePermissions(ctx)
assert.NotNil(t, project) assert.NotNil(t, project)

22
routers/web/repo/projects.go
View file

@ -36,7 +36,7 @@ const (
// MustEnableRepoProjects check if repo projects are enabled in settings // MustEnableRepoProjects check if repo projects are enabled in settings
func MustEnableRepoProjects(ctx *context.Context) { func MustEnableRepoProjects(ctx *context.Context) {
if unit.TypeProjects.UnitGlobalDisabled() { if unit.TypeProjects.UnitGlobalDisabled() {
ctx.NotFound("EnableKanbanBoard", nil) ctx.NotFound("EnableRepoProjects", nil)
return return
} }
@ -309,15 +309,15 @@ func ViewProject(ctx *context.Context) {
return return
} }
boards, err := project.GetColumns(ctx) columns, err := project.GetColumns(ctx)
if err != nil { if err != nil {
ctx.ServerError("GetProjectColumns", err) ctx.ServerError("GetProjectColumns", err)
return return
} }
issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, boards) issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns)
if err != nil { if err != nil {
ctx.ServerError("LoadIssuesOfBoards", err) ctx.ServerError("LoadIssuesOfColumns", err)
return return
} }
@ -372,7 +372,7 @@ func ViewProject(ctx *context.Context) {
ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
ctx.Data["Project"] = project ctx.Data["Project"] = project
ctx.Data["IssuesMap"] = issuesMap ctx.Data["IssuesMap"] = issuesMap
ctx.Data["Columns"] = boards // TODO: rename boards to columns in backend ctx.Data["Columns"] = columns
ctx.HTML(http.StatusOK, tplProjectsView) ctx.HTML(http.StatusOK, tplProjectsView)
} }
@ -432,7 +432,7 @@ func DeleteProjectColumn(ctx *context.Context) {
return return
} }
pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) pb, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
ctx.ServerError("GetProjectColumn", err) ctx.ServerError("GetProjectColumn", err)
return return
@ -451,7 +451,7 @@ func DeleteProjectColumn(ctx *context.Context) {
return 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) ctx.ServerError("DeleteProjectColumnByID", err)
return return
} }
@ -517,7 +517,7 @@ func checkProjectColumnChangePermissions(ctx *context.Context) (*project_model.P
return nil, nil return nil, nil
} }
column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
ctx.ServerError("GetProjectColumn", err) ctx.ServerError("GetProjectColumn", err)
return nil, nil return nil, nil
@ -570,7 +570,7 @@ func SetDefaultProjectColumn(ctx *context.Context) {
} }
if err := project_model.SetDefaultColumn(ctx, project.ID, column.ID); err != nil { if err := project_model.SetDefaultColumn(ctx, project.ID, column.ID); err != nil {
ctx.ServerError("SetDefaultBoard", err) ctx.ServerError("SetDefaultColumn", err)
return return
} }
@ -607,7 +607,7 @@ func MoveIssues(ctx *context.Context) {
return return
} }
column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":boardID")) column, err := project_model.GetColumn(ctx, ctx.ParamsInt64(":columnID"))
if err != nil { if err != nil {
if project_model.IsErrProjectColumnNotExist(err) { if project_model.IsErrProjectColumnNotExist(err) {
ctx.NotFound("ProjectColumnNotExist", nil) ctx.NotFound("ProjectColumnNotExist", nil)
@ -618,7 +618,7 @@ func MoveIssues(ctx *context.Context) {
} }
if column.ProjectID != project.ID { if column.ProjectID != project.ID {
ctx.NotFound("BoardNotInProject", nil) ctx.NotFound("ColumnNotInProject", nil)
return return
} }

2
routers/web/repo/projects_test.go
View file

@ -18,7 +18,7 @@ func TestCheckProjectColumnChangePermissions(t *testing.T) {
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
ctx.SetParams(":id", "1") ctx.SetParams(":id", "1")
ctx.SetParams(":boardID", "2") ctx.SetParams(":columnID", "2")
project, column := checkProjectColumnChangePermissions(ctx) project, column := checkProjectColumnChangePermissions(ctx)
assert.NotNil(t, project) assert.NotNil(t, project)

4
routers/web/web.go
View file

@ -1004,7 +1004,7 @@ func registerRoutes(m *web.Route) {
m.Post("/edit", web.Bind(forms.CreateProjectForm{}), org.EditProjectPost) m.Post("/edit", web.Bind(forms.CreateProjectForm{}), org.EditProjectPost)
m.Post("/{action:open|close}", org.ChangeProjectStatus) m.Post("/{action:open|close}", org.ChangeProjectStatus)
m.Group("/{boardID}", func() { m.Group("/{columnID}", func() {
m.Put("", web.Bind(forms.EditProjectColumnForm{}), org.EditProjectColumn) m.Put("", web.Bind(forms.EditProjectColumnForm{}), org.EditProjectColumn)
m.Delete("", org.DeleteProjectColumn) m.Delete("", org.DeleteProjectColumn)
m.Post("/default", org.SetDefaultProjectColumn) 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("/edit", web.Bind(forms.CreateProjectForm{}), repo.EditProjectPost)
m.Post("/{action:open|close}", repo.ChangeProjectStatus) m.Post("/{action:open|close}", repo.ChangeProjectStatus)
m.Group("/{boardID}", func() { m.Group("/{columnID}", func() {
m.Put("", web.Bind(forms.EditProjectColumnForm{}), repo.EditProjectColumn) m.Put("", web.Bind(forms.EditProjectColumnForm{}), repo.EditProjectColumn)
m.Delete("", repo.DeleteProjectColumn) m.Delete("", repo.DeleteProjectColumn)
m.Post("/default", repo.SetDefaultProjectColumn) m.Post("/default", repo.SetDefaultProjectColumn)