Skip to content

Commit c6d37f1

Browse files
committed
Some improvements
1 parent 7bd8220 commit c6d37f1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

models/issue.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,13 +1711,15 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
17111711

17121712
sess := func(cond builder.Cond) *xorm.Session {
17131713
s := db.GetEngine(db.DefaultContext).Where(cond)
1714-
s.Join("INNER", "repository", "issue.repo_id = repository.id")
17151714
if len(opts.LabelIDs) > 0 {
17161715
s.Join("INNER", "issue_label", "issue_label.issue_id = issue.id").
17171716
In("issue_label.label_id", opts.LabelIDs)
17181717
}
1719-
if opts.IsArchived != util.OptionalBoolNone {
1720-
s.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
1718+
if opts.UserID > 0 || opts.IsArchived != util.OptionalBoolNone {
1719+
s.Join("INNER", "repository", "issue.repo_id = repository.id")
1720+
if opts.IsArchived != util.OptionalBoolNone {
1721+
s.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
1722+
}
17211723
}
17221724
return s
17231725
}

models/repo_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func userOrgPublicRepoCondPrivate(userID int64) builder.Cond {
315315
Join("INNER", "`user`", "`user`.id = `org_user`.org_id").
316316
Where(builder.Eq{
317317
"`org_user`.uid": userID,
318-
"`user`.type": user_model.UserTypeOrganization,
318+
"`user`.`type`": user_model.UserTypeOrganization,
319319
"`user`.visibility": structs.VisibleTypePrivate,
320320
}),
321321
),

0 commit comments

Comments
 (0)