Skip to content

Commit 8bc8ca1

Browse files
authored
Improve GetBoards and getDefaultBoard (#22981)
Change `GetBoards(ctx context.Context, projectID int64)` to `(p *Project) GetBoards(ctx context.Context) (BoardList, error)` `getDefaultBoard` is same.
1 parent bedad23 commit 8bc8ca1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

models/project/board.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@ func UpdateBoard(ctx context.Context, board *Board) error {
229229

230230
// GetBoards fetches all boards related to a project
231231
// if no default board set, first board is a temporary "Uncategorized" board
232-
func GetBoards(ctx context.Context, projectID int64) (BoardList, error) {
232+
func (p *Project) GetBoards(ctx context.Context) (BoardList, error) {
233233
boards := make([]*Board, 0, 5)
234234

235-
if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", projectID, false).OrderBy("Sorting").Find(&boards); err != nil {
235+
if err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, false).OrderBy("Sorting").Find(&boards); err != nil {
236236
return nil, err
237237
}
238238

239-
defaultB, err := getDefaultBoard(ctx, projectID)
239+
defaultB, err := p.getDefaultBoard(ctx)
240240
if err != nil {
241241
return nil, err
242242
}
@@ -245,9 +245,9 @@ func GetBoards(ctx context.Context, projectID int64) (BoardList, error) {
245245
}
246246

247247
// getDefaultBoard return default board and create a dummy if none exist
248-
func getDefaultBoard(ctx context.Context, projectID int64) (*Board, error) {
248+
func (p *Project) getDefaultBoard(ctx context.Context) (*Board, error) {
249249
var board Board
250-
exist, err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", projectID, true).Get(&board)
250+
exist, err := db.GetEngine(ctx).Where("project_id=? AND `default`=?", p.ID, true).Get(&board)
251251
if err != nil {
252252
return nil, err
253253
}
@@ -257,7 +257,7 @@ func getDefaultBoard(ctx context.Context, projectID int64) (*Board, error) {
257257

258258
// represents a board for issues not assigned to one
259259
return &Board{
260-
ProjectID: projectID,
260+
ProjectID: p.ID,
261261
Title: "Uncategorized",
262262
Default: true,
263263
}, nil

routers/web/org/projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func ViewProject(ctx *context.Context) {
313313
return
314314
}
315315

316-
boards, err := project_model.GetBoards(ctx, project.ID)
316+
boards, err := project.GetBoards(ctx)
317317
if err != nil {
318318
ctx.ServerError("GetProjectBoards", err)
319319
return

routers/web/repo/projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ func ViewProject(ctx *context.Context) {
300300
return
301301
}
302302

303-
boards, err := project_model.GetBoards(ctx, project.ID)
303+
boards, err := project.GetBoards(ctx)
304304
if err != nil {
305305
ctx.ServerError("GetProjectBoards", err)
306306
return

0 commit comments

Comments
 (0)