mirror of
https://github.com/go-gitea/gitea.git
synced 2026-02-14 23:19:24 +00:00
f76f5207a7
This pull request adds milestone filtering support to both repository and organization project boards. Users can now filter project issues by milestone, similar to how they filter by label or assignee. The implementation includes backend changes to fetch and filter milestones, as well as frontend updates to display a milestone filter dropdown in the project board UI. **Milestone filtering support:** * Added support for filtering project board issues by milestone in both repository and organization contexts, including handling for "no milestone" and "all milestones" options. (`routers/web/repo/projects.go` [[1]](diffhunk://#diff-5cba331a1ddf1eea017178cfefaaff9ad72a4b05797fb84bf508b0939aae2972R316-R330) [[2]](diffhunk://#diff-5cba331a1ddf1eea017178cfefaaff9ad72a4b05797fb84bf508b0939aae2972R421-R441); `routers/web/org/projects.go` [[3]](diffhunk://#diff-f4279417070a8e33829c338abeb42877500377f490abb1495ae6357d50b6a765R344-R357) [[4]](diffhunk://#diff-f4279417070a8e33829c338abeb42877500377f490abb1495ae6357d50b6a765R433-R485) * Updated the project board template to include a milestone filter dropdown, displaying open and closed milestones and integrating with the query string for filtering. (`templates/projects/view.tmpl` [[1]](diffhunk://#diff-e2c7e14d247ce381c352263a8fa639b8341690ff85f6dbebfa166ee3306542feL8-R8) [[2]](diffhunk://#diff-e2c7e14d247ce381c352263a8fa639b8341690ff85f6dbebfa166ee3306542feR19-R58) Solves Issue #35224 --------- Signed-off-by: josetduarte <6619440+josetduarte@users.noreply.github.com> Co-authored-by: joseduarte <joseduarte@aidhound.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
160 lines
7.2 KiB
Handlebars
160 lines
7.2 KiB
Handlebars
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
|
|
|
|
<div class="ui container fluid padded projects-view">
|
|
<div class="ui container flex-text-block project-header">
|
|
<h2>{{.Project.Title}}</h2>
|
|
<div class="tw-flex-1"></div>
|
|
<div class="ui secondary menu tw-m-0">
|
|
{{$queryLink := QueryBuild "?" "labels" .SelectLabels "assignee" $.AssigneeID "milestone" $.MilestoneID "archived_labels" (Iif $.ShowArchivedLabels "true")}}
|
|
{{template "repo/issue/filter_item_label" dict "Labels" .Labels "QueryLink" $queryLink "SupportArchivedLabel" true}}
|
|
{{template "repo/issue/filter_item_user_assign" dict
|
|
"QueryParamKey" "assignee"
|
|
"QueryLink" $queryLink
|
|
"UserSearchList" $.Assignees
|
|
"SelectedUserId" $.AssigneeID
|
|
"TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee")
|
|
"TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assignee_no_assignee")
|
|
"TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee")
|
|
}}
|
|
{{template "repo/issue/filter_item_milestone" dict
|
|
"QueryLink" $queryLink
|
|
"MilestoneID" $.MilestoneID
|
|
"OpenMilestones" .OpenMilestones
|
|
"ClosedMilestones" .ClosedMilestones
|
|
}}
|
|
</div>
|
|
{{if $canWriteProject}}
|
|
<div class="ui compact mini menu">
|
|
<a class="item screen-full">
|
|
{{svg "octicon-screen-full"}}
|
|
{{ctx.Locale.Tr "projects.enter_fullscreen"}}
|
|
</a>
|
|
<a class="item screen-normal tw-hidden">
|
|
{{svg "octicon-screen-normal"}}
|
|
{{ctx.Locale.Tr "projects.exit_fullscreen"}}
|
|
</a>
|
|
<a class="item" href="{{.Link}}/edit?redirect=project">
|
|
{{svg "octicon-pencil"}}
|
|
{{ctx.Locale.Tr "repo.issues.label_edit"}}
|
|
</a>
|
|
{{if .Project.IsClosed}}
|
|
<button class="item btn link-action" data-url="{{.Link}}/open">
|
|
{{svg "octicon-check"}}
|
|
{{ctx.Locale.Tr "repo.projects.open"}}
|
|
</button>
|
|
{{else}}
|
|
<button class="item btn link-action" data-url="{{.Link}}/close">
|
|
{{svg "octicon-skip"}}
|
|
{{ctx.Locale.Tr "repo.projects.close"}}
|
|
</button>
|
|
{{end}}
|
|
<button class="item btn link-action" data-url="{{.Link}}/delete?id={{.Project.ID}}"
|
|
data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.deletion"}}"
|
|
data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.deletion_desc"}}"
|
|
>
|
|
{{svg "octicon-trash"}}
|
|
{{ctx.Locale.Tr "repo.issues.label_delete"}}
|
|
</button>
|
|
<button class="item btn show-modal show-project-column-modal-edit" data-modal="#project-column-modal-edit"
|
|
data-modal-header="{{ctx.Locale.Tr "repo.projects.column.new"}}"
|
|
data-modal-project-column-title-label="{{ctx.Locale.Tr "repo.projects.column.new_title"}}"
|
|
data-modal-project-column-button-save="{{ctx.Locale.Tr "repo.projects.column.new_submit"}}"
|
|
data-modal-project-column-id=""
|
|
data-modal-project-column-title-input=""
|
|
data-modal-project-column-color-input=""
|
|
>
|
|
{{svg "octicon-plus"}}
|
|
{{ctx.Locale.Tr "new_project_column"}}
|
|
</button>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
<div class="ui container project-description">
|
|
<div class="render-content markup">
|
|
{{$.Project.RenderedContent}}
|
|
</div>
|
|
<div class="divider"></div>
|
|
</div>
|
|
|
|
<div id="project-board" class="board {{if $canWriteProject}}sortable{{end}}" data-project-borad-writable="{{$canWriteProject}}" {{if $canWriteProject}}data-url="{{$.Link}}/move"{{end}}>
|
|
{{range .Columns}}
|
|
<div class="project-column" {{if .Color}}style="background: {{.Color}} !important; color: {{ContrastColor .Color}} !important"{{end}} data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}">
|
|
<div class="project-column-header{{if $canWriteProject}} tw-cursor-grab{{end}}">
|
|
<div class="ui circular label project-column-issue-count">
|
|
{{.NumIssues}}
|
|
</div>
|
|
<div class="project-column-title-text flex-text-inline gt-ellipsis" {{if .Default}}data-tooltip-content="{{ctx.Locale.Tr "repo.projects.column.default_column_hint"}}"{{end}}>
|
|
{{if .Default}}{{svg "octicon-star"}} {{end}}{{.Title}}
|
|
</div>
|
|
{{if $canWriteProject}}
|
|
<div class="ui dropdown tw-p-1">
|
|
{{svg "octicon-kebab-horizontal"}}
|
|
<div class="menu">
|
|
<a class="item button show-modal show-project-column-modal-edit" data-modal="#project-column-modal-edit"
|
|
data-modal-header="{{ctx.Locale.Tr "repo.projects.column.edit"}}"
|
|
data-modal-project-column-title-label="{{ctx.Locale.Tr "repo.projects.column.edit_title"}}"
|
|
data-modal-project-column-button-save="{{ctx.Locale.Tr "repo.projects.column.edit"}}"
|
|
data-modal-project-column-id="{{.ID}}"
|
|
data-modal-project-column-title-input="{{.Title}}"
|
|
data-modal-project-column-color-input="{{.Color}}"
|
|
>
|
|
{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.projects.column.edit"}}
|
|
</a>
|
|
{{if not .Default}}
|
|
<a class="item button link-action" data-url="{{$.Link}}/{{.ID}}/default"
|
|
data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.column.set_default"}}"
|
|
data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.column.set_default_desc"}}"
|
|
>
|
|
{{svg "octicon-star"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}}
|
|
</a>
|
|
<a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-link-action-method="DELETE"
|
|
data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.column.delete"}}"
|
|
data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.column.deletion_desc"}}"
|
|
>
|
|
{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.projects.column.delete"}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="divider"{{if .Color}} style="color: {{ContrastColor .Color}} !important"{{end}}></div>
|
|
<div class="ui cards" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
|
|
{{range (index $.IssuesMap .ID)}}
|
|
<div class="issue-card tw-break-anywhere {{if $canWriteProject}}tw-cursor-grab{{end}}" data-issue="{{.ID}}">
|
|
{{template "repo/issue/card" (dict "Issue" . "Page" $)}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
{{if $canWriteProject}}
|
|
<div class="ui small modal" id="project-column-modal-edit">
|
|
<div class="header">edit</div>
|
|
<div class="content">
|
|
<form class="ui form ignore-dirty" method="post" data-action-base-link="{{$.Link}}">
|
|
<input class="project-column-id" type="hidden" name="id">
|
|
<div class="required field">
|
|
<label class="project-column-title-label" for="project-column-title-input">title</label>
|
|
<input id="project-column-title-input" name="title" required>
|
|
</div>
|
|
<div class="field">
|
|
<label class="project-column-color-label" for="project-column-color-input">color</label>
|
|
<div class="color-picker-combo" data-global-init="initColorPicker">
|
|
<input maxlength="7" placeholder="#c320f6" id="project-column-color-input" name="color">
|
|
{{template "repo/issue/label_precolors"}}
|
|
</div>
|
|
</div>
|
|
<div class="actions">
|
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
<button type="submit" class="ui primary button project-column-button-save">save</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{{end}}
|