Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show total TrackedTime on issue/pull/milestone lists #26672

Merged
merged 44 commits into from
Oct 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
377d160
Show total TrackedTime in issue list and milestone issue list [partia…
6543 Jun 6, 2023
056ea96
rm diff thats to be in next pull
6543 Aug 22, 2023
7e7a2c5
adjust to renamed opt
6543 Aug 22, 2023
b96699e
Add GetIssueTotalTrackedTime, witch returns the total tracked time fo…
6543 Aug 22, 2023
a14d804
adjust to current codebase
6543 Aug 22, 2023
b9db680
adjust code-scope [see with no whitespace changes]
6543 Aug 22, 2023
ecccc50
add TotalTrackedTime Data for template
6543 Aug 22, 2023
2f4728d
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Aug 23, 2023
e2349bc
Update routers/web/repo/issue.go
6543 Aug 23, 2023
c50d2f1
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Aug 30, 2023
b18c837
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Sep 25, 2023
e9766f1
fix
6543 Sep 25, 2023
b3e9420
comment
6543 Sep 25, 2023
26c34c7
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Sep 30, 2023
cbf2965
WIP: WebUI
6543 Sep 30, 2023
bffb2b2
TTT in MS looks good now ;)
6543 Sep 30, 2023
4706f89
WIP: TTT on issue list
6543 Sep 30, 2023
f80779d
try vertical align ?!?
6543 Sep 30, 2023
0463116
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Sep 30, 2023
b110d85
TTT in issue list looks good now ;)
6543 Sep 30, 2023
4cd950c
fix lint & wip test
6543 Sep 30, 2023
aa562fc
context
6543 Oct 1, 2023
db387c0
fix and extend tests
6543 Oct 1, 2023
ae166a0
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 1, 2023
ecb01c2
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 1, 2023
969bb41
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 2, 2023
fc27f22
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 2, 2023
3a1dab8
Update options/locale/locale_en-US.ini
6543 Oct 3, 2023
bc900f4
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 3, 2023
f1b4128
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 4, 2023
d4ffd1b
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 7, 2023
10d18bd
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 8, 2023
5385025
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 9, 2023
a82da3a
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 12, 2023
2d55b1a
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 13, 2023
04594bc
only exec if tt in repo is enabled
6543 Oct 13, 2023
beb3b64
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 14, 2023
3b1b7a0
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 15, 2023
697c4a1
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 15, 2023
d102bd8
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 16, 2023
b809a91
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 17, 2023
77e3d4e
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
silverwind Oct 17, 2023
d7f0392
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 19, 2023
d0bedae
Merge branch 'main' into upstream_trackedTimeSummaryOnIssueList
6543 Oct 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust code-scope [see with no whitespace changes]
  • Loading branch information
6543 committed Aug 22, 2023
commit b9db680ea79868e3d4eded25c6f848c9ef2db429
69 changes: 33 additions & 36 deletions routers/web/repo/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,46 +197,43 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
}

var issueStats *issues_model.IssueStats
{
statsOpts := &issues_model.IssuesOptions{
RepoIDs: []int64{repo.ID},
LabelIDs: labelIDs,
MilestoneIDs: mileIDs,
ProjectID: projectID,
AssigneeID: assigneeID,
MentionedID: mentionedID,
PosterID: posterID,
ReviewRequestedID: reviewRequestedID,
ReviewedID: reviewedID,
IsPull: isPullOption,
IssueIDs: nil,
}
if keyword != "" {
allIssueIDs, err := issueIDsFromSearch(ctx, keyword, statsOpts)
if err != nil {
if issue_indexer.IsAvailable(ctx) {
ctx.ServerError("issueIDsFromSearch", err)
return
}
ctx.Data["IssueIndexerUnavailable"] = true
statsOpts := &issues_model.IssuesOptions{
RepoIDs: []int64{repo.ID},
LabelIDs: labelIDs,
MilestoneIDs: mileIDs,
ProjectID: projectID,
AssigneeID: assigneeID,
MentionedID: mentionedID,
PosterID: posterID,
ReviewRequestedID: reviewRequestedID,
ReviewedID: reviewedID,
IsPull: isPullOption,
IssueIDs: nil,
}
if keyword != "" {
allIssueIDs, err := issueIDsFromSearch(ctx, keyword, statsOpts)
if err != nil {
if issue_indexer.IsAvailable(ctx) {
ctx.ServerError("issueIDsFromSearch", err)
return
}
statsOpts.IssueIDs = allIssueIDs
ctx.Data["IssueIndexerUnavailable"] = true
return
}
if keyword != "" && len(statsOpts.IssueIDs) == 0 {
// So it did search with the keyword, but no issue found.
// Just set issueStats to empty.
issueStats = &issues_model.IssueStats{}
} else {
// So it did search with the keyword, and found some issues. It needs to get issueStats of these issues.
// Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts.
issueStats, err = issues_model.GetIssueStats(statsOpts)
if err != nil {
ctx.ServerError("GetIssueStats", err)
return
}
statsOpts.IssueIDs = allIssueIDs
}
if keyword != "" && len(statsOpts.IssueIDs) == 0 {
// So it did search with the keyword, but no issue found.
// Just set issueStats to empty.
issueStats = &issues_model.IssueStats{}
} else {
// So it did search with the keyword, and found some issues. It needs to get issueStats of these issues.
// Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts.
issueStats, err = issues_model.GetIssueStats(statsOpts)
if err != nil {
ctx.ServerError("GetIssueStats", err)
return
}

}

isShowClosed := ctx.FormString("state") == "closed"
Expand Down