mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
fix: honor org/user project in new issue (#9906)
Previously, when a project id was passed into the new issue form as a query parameter, it wouldn’t be selected if the project belonged to the user or organization instead of directly to the repository. Resolves forgejo/forgejo#8489 Signed-off-by: Nils Philippsen <nils@redhat.com> Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9906 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Robert Wolff <mahlzahn@posteo.de> Co-authored-by: Nils Philippsen <nilsph@noreply.codeberg.org> Co-committed-by: Nils Philippsen <nilsph@noreply.codeberg.org>
This commit is contained in:
parent
ba2020a333
commit
5589182c54
4 changed files with 114 additions and 11 deletions
|
|
@ -42,7 +42,7 @@
|
|||
is_closed: false
|
||||
creator_id: 2
|
||||
board_type: 1
|
||||
type: 2
|
||||
type: 1
|
||||
created_unix: 1688973000
|
||||
updated_unix: 1688973000
|
||||
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
is_closed: false
|
||||
creator_id: 2
|
||||
board_type: 1
|
||||
type: 2
|
||||
type: 1
|
||||
created_unix: 1688973000
|
||||
updated_unix: 1688973000
|
||||
|
||||
|
|
@ -66,6 +66,18 @@
|
|||
is_closed: false
|
||||
creator_id: 2
|
||||
board_type: 1
|
||||
type: 2
|
||||
type: 1
|
||||
created_unix: 1688973000
|
||||
updated_unix: 1688973000
|
||||
|
||||
-
|
||||
id: 7
|
||||
title: project on org3
|
||||
owner_id: 3
|
||||
repo_id: 0
|
||||
is_closed: false
|
||||
creator_id: 2
|
||||
board_type: 1
|
||||
type: 1
|
||||
created_unix: 1688973000
|
||||
updated_unix: 1688973000
|
||||
|
|
|
|||
|
|
@ -93,19 +93,19 @@ func TestProjectsSort(t *testing.T) {
|
|||
}{
|
||||
{
|
||||
sortType: "default",
|
||||
wants: []int64{1, 3, 2, 6, 5, 4},
|
||||
wants: []int64{1, 3, 2, 7, 6, 5, 4},
|
||||
},
|
||||
{
|
||||
sortType: "oldest",
|
||||
wants: []int64{4, 5, 6, 2, 3, 1},
|
||||
wants: []int64{4, 5, 6, 7, 2, 3, 1},
|
||||
},
|
||||
{
|
||||
sortType: "recentupdate",
|
||||
wants: []int64{1, 3, 2, 6, 5, 4},
|
||||
wants: []int64{1, 3, 2, 7, 6, 5, 4},
|
||||
},
|
||||
{
|
||||
sortType: "leastupdate",
|
||||
wants: []int64{4, 5, 6, 2, 3, 1},
|
||||
wants: []int64{4, 5, 6, 7, 2, 3, 1},
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -114,8 +114,8 @@ func TestProjectsSort(t *testing.T) {
|
|||
OrderBy: GetSearchOrderByBySortType(tt.sortType),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(6), count)
|
||||
if assert.Len(t, projects, 6) {
|
||||
assert.Equal(t, int64(7), count)
|
||||
if assert.Len(t, projects, 7) {
|
||||
for i := range projects {
|
||||
assert.Equal(t, tt.wants[i], projects[i].ID)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue