Merge branch 'main' into fix-20621-no-err-in-IsUserAllowedToUpdate

lunny · web-flow · commit 561e84e9c968 · 2022-08-18T10:24:38.000+08:00
diff --git a/models/repo/mirror.go b/models/repo/mirror.go
@@ -153,7 +153,9 @@ func (repos MirrorRepositoryList) loadAttributes(ctx context.Context) error {
 	}
 	for i := range repos {
 		repos[i].Mirror = set[repos[i].ID]
-		repos[i].Mirror.Repo = repos[i]
+		if repos[i].Mirror != nil {
+			repos[i].Mirror.Repo = repos[i]
+		}
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,9 @@ func (repos MirrorRepositoryList) loadAttributes(ctx context.Context) error {`
`153`	`153`	`}`
`154`	`154`	`for i := range repos {`
`155`	`155`	`repos[i].Mirror = set[repos[i].ID]`
`156`		`- repos[i].Mirror.Repo = repos[i]`
	`156`	`+ if repos[i].Mirror != nil {`
	`157`	`+ repos[i].Mirror.Repo = repos[i]`
	`158`	`+ }`
`157`	`159`	`}`
`158`	`160`	`return nil`
`159`	`161`	`}`