mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-15 22:01:08 +00:00
50070550a8
Followup https://github.com/go-gitea/gitea/pull/26820 ## Archived labels UI for issue filter and issue filter actions for issues/pull request pages. Changed: * Enhanced the Issue filter and Issue filter actions UI page to seamlessly incorporate a list of archived labels. * Pagination functionality is same as before. If archived label checkbox is checked then we are adding a query string`archived=true` in the url to save the state of page. * Issue filter actions menu is separated into different template. * Adding the archived flag in issue url labels. * Pull Request page is also work the same. Outsourced: * Defer the implementation of specialized handling for archived labels to upcoming pull requests. This step will be undertaken subsequent to the successful merge of this pull request. Screenshots ### Issue page <img width="1360" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/d7efb2ef-5b2b-449d-83f0-d430a32ec432"> ### Issue page with label filter on archived label checkbox when not checked --> No archived label is there in list <img width="1249" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/ceea68ef-91f2-4693-910f-2e25e236bfc9"> ### Issue page with label filter on archived label checkbox when checked --> Show archived label in the list. <img width="710" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/2414d26b-2079-4c3c-bd9e-f2f5411bcabf"> ### Issue page with label filter on issue action menu on archived label checkbox when checked --> Show archived label in the list. <img width="409" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/259cac87-3e21-4778-99a2-a6a0b8c81178"> ### Applied the archived=true in Issue labels when archived checkbox is checked. <img width="984" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/657ce3db-c0ae-402e-b12d-3b580d3c2ed0"> --- Part of https://github.com/go-gitea/gitea/issues/25237 --------- Signed-off-by: puni9869 <punitinani1@hotmail.com> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Giteabot <teabot@gitea.io>
160 lines
6.8 KiB
Go HTML Template
160 lines
6.8 KiB
Go HTML Template
<div id="issue-list" class="flex-list">
|
|
{{$approvalCounts := .ApprovalCounts}}
|
|
{{range .Issues}}
|
|
<div class="flex-item">
|
|
|
|
<div class="flex-item-icon">
|
|
{{if $.CanWriteIssuesOrPulls}}
|
|
<input type="checkbox" autocomplete="off" class="issue-checkbox gt-mr-4" data-issue-id={{.ID}} aria-label="{{ctx.Locale.Tr "repo.issues.action_check"}} "{{.Title}}"">
|
|
{{end}}
|
|
{{template "shared/issueicon" .}}
|
|
</div>
|
|
|
|
<div class="flex-item-main">
|
|
<div class="flex-item-header">
|
|
<div class="flex-item-title">
|
|
<a class="gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
|
|
{{if .IsPull}}
|
|
{{if (index $.CommitStatuses .PullRequest.ID)}}
|
|
{{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}}
|
|
{{end}}
|
|
{{end}}
|
|
<span class="labels-list gt-ml-2">
|
|
{{range .Labels}}
|
|
<a href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{RenderLabel $.Context .}}</a>
|
|
{{end}}
|
|
</span>
|
|
</div>
|
|
{{if or .TotalTrackedTime .Assignees .NumComments}}
|
|
<div class="flex-item-trailing">
|
|
{{if .TotalTrackedTime}}
|
|
<div class="text grey flex-text-block">
|
|
{{svg "octicon-clock" 16}}
|
|
{{.TotalTrackedTime | Sec2Time}}
|
|
</div>
|
|
{{end}}
|
|
{{if .Assignees}}
|
|
<div class="text grey">
|
|
{{range .Assignees}}
|
|
<a class="ui assignee gt-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
|
|
{{ctx.AvatarUtils.Avatar . 20}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
{{if .NumComments}}
|
|
<div class="text grey">
|
|
<a class="gt-no-underline muted flex-text-block" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
|
{{svg "octicon-comment" 16}}{{.NumComments}}
|
|
</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="flex-item-body">
|
|
<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
|
{{if eq $.listType "dashboard"}}
|
|
{{.Repo.FullName}}#{{.Index}}
|
|
{{else}}
|
|
#{{.Index}}
|
|
{{end}}
|
|
</a>
|
|
{{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}}
|
|
{{if .OriginalAuthor}}
|
|
{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
|
|
{{else if gt .Poster.ID 0}}
|
|
{{ctx.Locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
|
|
{{end}}
|
|
{{if .IsPull}}
|
|
<div class="branches flex-text-inline">
|
|
<div class="branch">
|
|
<a href="{{.PullRequest.BaseRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
|
|
{{/* inline to remove the spaces between spans */}}
|
|
{{if ne .RepoID .PullRequest.BaseRepoID}}<span class="truncated-name">{{.PullRequest.BaseRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.BaseBranch}}</span>
|
|
</a>
|
|
</div>
|
|
{{svg "gitea-double-chevron-left" 12}}
|
|
{{if .PullRequest.HeadRepo}}
|
|
<div class="branch">
|
|
<a href="{{.PullRequest.HeadRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.HeadBranch}}">
|
|
{{/* inline to remove the spaces between spans */}}
|
|
{{if ne .RepoID .PullRequest.HeadRepoID}}<span class="truncated-name">{{.PullRequest.HeadRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.HeadBranch}}</span>
|
|
</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
{{if and .Milestone (ne $.listType "milestone")}}
|
|
<a class="milestone flex-text-inline" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
|
|
{{svg "octicon-milestone" 14}}{{.Milestone.Name}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Project}}
|
|
<a class="project flex-text-inline" href="{{.Project.Link ctx}}">
|
|
{{svg .Project.IconName 14}}{{.Project.Title}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Ref}}
|
|
<a class="ref flex-text-inline" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{.Repo.Link}}{{index $.IssueRefURLs .ID}}"{{end}}>
|
|
{{svg "octicon-git-branch" 14}}{{index $.IssueRefEndNames .ID}}
|
|
</a>
|
|
{{end}}
|
|
{{$tasks := .GetTasks}}
|
|
{{if gt $tasks 0}}
|
|
{{$tasksDone := .GetTasksDone}}
|
|
<span class="checklist flex-text-inline">
|
|
{{svg "octicon-checklist" 14}}{{$tasksDone}} / {{$tasks}}
|
|
<progress value="{{$tasksDone}}" max="{{$tasks}}"></progress>
|
|
</span>
|
|
{{end}}
|
|
{{if ne .DeadlineUnix 0}}
|
|
<span class="due-date flex-text-inline" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date"}}">
|
|
<span{{if .IsOverdue}} class="text red"{{end}}>
|
|
{{svg "octicon-calendar" 14}}
|
|
{{DateTime "short" .DeadlineUnix}}
|
|
</span>
|
|
</span>
|
|
{{end}}
|
|
{{if .IsPull}}
|
|
{{$approveOfficial := call $approvalCounts .ID "approve"}}
|
|
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
|
|
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
|
|
{{if gt $approveOfficial 0}}
|
|
<span class="approvals green flex-text-inline">
|
|
{{svg "octicon-check" 14}}
|
|
{{ctx.Locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $rejectOfficial 0}}
|
|
<span class="rejects red flex-text-inline">
|
|
{{svg "octicon-diff" 14}}
|
|
{{ctx.Locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $waitingOfficial 0}}
|
|
<span class="waiting flex-text-inline">
|
|
{{svg "octicon-eye" 14}}
|
|
{{ctx.Locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
|
|
<span class="conflicting flex-text-inline">
|
|
{{svg "octicon-x" 14}}
|
|
{{ctx.Locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}}
|
|
</span>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
{{if .IssueIndexerUnavailable}}
|
|
<div class="ui error message">
|
|
<p>{{ctx.Locale.Tr "repo.issues.keyword_search_unavailable"}}</p>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|