Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix project issues list and counting #33594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Feb 17, 2025
Merged

Fix project issues list and counting #33594

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e6f719c
Fix project issues list
lunny Feb 13, 2025
611862f
Improve project issues retrieves and numbers
lunny Feb 14, 2025
374e11e
Fix checks
lunny Feb 14, 2025
134f691
Adjust tests
lunny Feb 15, 2025
7344a1e
Fix lint
lunny Feb 15, 2025
a845cd1
Fix checks
lunny Feb 15, 2025
5878ceb
Cleanup tests resources
lunny Feb 15, 2025
2f2ccd9
Fix get default column
lunny Feb 15, 2025
1133503
Fix test
lunny Feb 15, 2025
fc6cab9
Merge branch 'main' into lunny/fix_project_issues_list
lunny Feb 15, 2025
b63e059
Improvements
lunny Feb 16, 2025
707af3c
Merge branch 'main' into lunny/fix_project_issues_list
lunny Feb 16, 2025
0b82fed
Fix test
lunny Feb 16, 2025
25ebf7c
Apply suggestions from code review
lunny Feb 17, 2025
5a106cf
Use a different sort when getting default column of project
lunny Feb 17, 2025
d215623
Merge branch 'lunny/fix_project_issues_list' of github.com:lunny/gite…
lunny Feb 17, 2025
e859276
Fix test because of get default logic change
lunny Feb 17, 2025
92dedaf
Update models/project/column_test.go
wxiaoguang Feb 17, 2025
74c9b7b
Update models/project/column.go
wxiaoguang Feb 17, 2025
3670a2c
Update models/project/column_test.go
wxiaoguang Feb 17, 2025
91ad9af
Merge branch 'main' into lunny/fix_project_issues_list
wxiaoguang Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion models/project/column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ func (p *Project) getDefaultColumn(ctx context.Context) (*Column, error) {
return nil, ErrProjectColumnNotExist{ColumnID: 0}
}

// MustDefaultColumn returns the default column for a project, get the first one if exist one and creating one if it does not exist
// MustDefaultColumn returns the default column for a project.
// If one exists, it is returned
// If none exists, the first column will be elevated to the default column of this project
func (p *Project) MustDefaultColumn(ctx context.Context) (*Column, error) {
c, err := p.getDefaultColumn(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Desc(id) in the called method seems incorrect.
Shouldn't it be Asc(sorting, id) instead?
(even if it might be potentially minimally breaking if someone misconfigured their projects)

Copy link
Member Author

@lunny lunny Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's already OrderBy("sorting, id")?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5a106cf

Copy link
Contributor

@wxiaoguang wxiaoguang Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think it should change the existing logic in getDefaultColumn

The old logic means this: use the latest default one. It doesn't care about "sorting" or not. There should be only one "default" column, the "order by" is just a fallback.

if err != nil && !IsErrProjectColumnNotExist(err) {
Expand Down
2 changes: 1 addition & 1 deletion services/projects/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func MoveIssuesOnProjectColumn(ctx context.Context, doer *user_model.User, colum
})
}

// LoadIssuesFromProject load issues assigned to the project
// LoadIssuesFromProject load issues assigned to each project column inside the given project
func LoadIssuesFromProject(ctx context.Context, project *project_model.Project, opts *issues_model.IssuesOptions) (map[int64]issues_model.IssueList, error) {
issueList, err := issues_model.Issues(ctx, opts.Copy(func(o *issues_model.IssuesOptions) {
o.ProjectID = project.ID
Expand Down
Loading