Skip to content

Commit 0a45d66

Browse files
committed
Follow yp05327's suggestion
1 parent 0766b94 commit 0a45d66

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

models/issues/issue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ func (issue *Issue) LoadAttachments(ctx context.Context) (err error) {
197197
}
198198

199199
issue.Attachments, err = repo_model.GetAttachmentsByIssueID(ctx, issue.ID)
200-
issue.isAttachmentsLoaded = true
201200
if err != nil {
202201
return fmt.Errorf("getAttachmentsByIssueID [%d]: %w", issue.ID, err)
203202
}
203+
issue.isAttachmentsLoaded = true
204204
return nil
205205
}
206206

@@ -306,10 +306,10 @@ func (issue *Issue) loadReactions(ctx context.Context) (err error) {
306306
func (issue *Issue) LoadMilestone(ctx context.Context) (err error) {
307307
if !issue.isMilestoneLoaded && (issue.Milestone == nil || issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {
308308
issue.Milestone, err = GetMilestoneByRepoID(ctx, issue.RepoID, issue.MilestoneID)
309-
issue.isMilestoneLoaded = true
310309
if err != nil && !IsErrMilestoneNotExist(err) {
311310
return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %w", issue.RepoID, issue.MilestoneID, err)
312311
}
312+
issue.isMilestoneLoaded = true
313313
}
314314
return nil
315315
}

models/issues/issue_label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ func FixIssueLabelWithOutsideLabels(ctx context.Context) (int64, error) {
330330
func (issue *Issue) LoadLabels(ctx context.Context) (err error) {
331331
if !issue.isLabelsLoaded && issue.Labels == nil && issue.ID != 0 {
332332
issue.Labels, err = GetLabelsByIssueID(ctx, issue.ID)
333-
issue.isLabelsLoaded = true
334333
if err != nil {
335334
return fmt.Errorf("getLabelsByIssueID [%d]: %w", issue.ID, err)
336335
}
336+
issue.isLabelsLoaded = true
337337
}
338338
return nil
339339
}

models/issues/pull.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,14 @@ func (pr *PullRequest) LoadRequestedReviewers(ctx context.Context) error {
294294
return nil
295295
}
296296

297-
pr.isRequestedReviewersLoaded = true
298297
reviews, err := GetReviewsByIssueID(ctx, pr.Issue.ID)
299298
if err != nil {
300299
return err
301300
}
302-
303301
if err = reviews.LoadReviewers(ctx); err != nil {
304302
return err
305303
}
304+
pr.isRequestedReviewersLoaded = true
306305
for _, review := range reviews {
307306
pr.RequestedReviewers = append(pr.RequestedReviewers, review.Reviewer)
308307
}

0 commit comments

Comments
 (0)