github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-04-15 01:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[release/v2.8] Fix addon nil values (#4666) (#4693)

Browse Source 
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
This commit is contained in:
Patrick Schratz
2025-01-10 18:48:32 +01:00
committed by GitHub
parent d76144ef42
commit 8f46d0d85a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/forge/addon/args.go
View File

@@ -110,6 +110,9 @@ type modelUser struct {
}
func (m *modelUser) asModel() *model.User {
if m == nil {
return nil
}
m.User.ForgeRemoteID = m.ForgeRemoteID
m.User.Token = m.Token
m.User.Secret = m.Secret
@@ -119,6 +122,9 @@ func (m *modelUser) asModel() *model.User {
}
func modelUserFromModel(u *model.User) *modelUser {
if u == nil {
return nil
}
return &modelUser{
User: u,
ForgeRemoteID: u.ForgeRemoteID,
@@ -138,6 +144,9 @@ type modelRepo struct {
}
func (m *modelRepo) asModel() *model.Repo {
if m == nil {
return nil
}
m.Repo.UserID = m.UserID
m.Repo.Hash = m.Hash
m.Repo.Perm = m.Perm
@@ -145,6 +154,9 @@ func (m *modelRepo) asModel() *model.Repo {
}
func modelRepoFromModel(r *model.Repo) *modelRepo {
if r == nil {
return nil
}
return &modelRepo{
Repo: r,
UserID: r.UserID,