mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 21:08:25 +00:00 
			
		
		
		
	Use GhostUser if needed for TrackedTimes (#22021)
When getting tracked times out of the db and loading their attributes handle not exist errors in a nicer way. (Also prevent an NPE.) Fix #22006 Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		@@ -5,6 +5,7 @@ package issues
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"errors"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models/db"
 | 
			
		||||
@@ -46,33 +47,41 @@ func (t *TrackedTime) LoadAttributes() (err error) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (t *TrackedTime) loadAttributes(ctx context.Context) (err error) {
 | 
			
		||||
	// Load the issue
 | 
			
		||||
	if t.Issue == nil {
 | 
			
		||||
		t.Issue, err = GetIssueByID(ctx, t.IssueID)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return
 | 
			
		||||
		if err != nil && !errors.Is(err, util.ErrNotExist) {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	// Now load the repo for the issue (which we may have just loaded)
 | 
			
		||||
	if t.Issue != nil {
 | 
			
		||||
		err = t.Issue.LoadRepo(ctx)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return
 | 
			
		||||
		if err != nil && !errors.Is(err, util.ErrNotExist) {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	// Load the user
 | 
			
		||||
	if t.User == nil {
 | 
			
		||||
		t.User, err = user_model.GetUserByID(ctx, t.UserID)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
			if !errors.Is(err, util.ErrNotExist) {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			t.User = user_model.NewGhostUser()
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// LoadAttributes load Issue, User
 | 
			
		||||
func (tl TrackedTimeList) LoadAttributes() (err error) {
 | 
			
		||||
func (tl TrackedTimeList) LoadAttributes() error {
 | 
			
		||||
	for _, t := range tl {
 | 
			
		||||
		if err = t.LoadAttributes(); err != nil {
 | 
			
		||||
		if err := t.LoadAttributes(); err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return err
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// FindTrackedTimesOptions represent the filters for tracked times. If an ID is 0 it will be ignored.
 | 
			
		||||
 
 | 
			
		||||
@@ -113,7 +113,6 @@ func ToTrackedTime(ctx context.Context, t *issues_model.TrackedTime) (apiT *api.
 | 
			
		||||
		ID:      t.ID,
 | 
			
		||||
		IssueID: t.IssueID,
 | 
			
		||||
		UserID:  t.UserID,
 | 
			
		||||
		UserName: t.User.Name,
 | 
			
		||||
		Time:    t.Time,
 | 
			
		||||
		Created: t.Created,
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user