mattnite
/
forgejo-tickets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix filtering selection' (#66) from fix-filtering into main 

Reviewed-on: https://git.ts.mattnite.net/mattnite/forgejo-tickets/pulls/66
This commit is contained in:
Matthew Knight 2026-02-19 06:50:51 +00:00
parent 040f848268 733fa94826
commit fbe593b131
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/static/js/filters.js Normal file
View File

@ -0,0 +1,7 @@
document.addEventListener('DOMContentLoaded', function () {
document.querySelectorAll('select[data-filter-nav]').forEach(function (sel) {
sel.addEventListener('change', function () {
window.location.href = this.value;
});
});
});

1
web/templates/layouts/admin.html
View File

@ -14,5 +14,6 @@
{{block "content" .}}{{end}} {{block "content" .}}{{end}}
</main> </main>
</div> </div>
<script src="/static/js/filters.js"></script>
</body> </body>
</html> </html>

1
web/templates/layouts/base.html
View File

@ -15,6 +15,7 @@
</main> </main>
</div> </div>
<span class="hidden ring-blue-400 bg-blue-50 border-blue-400 hover:text-red-500"></span> <span class="hidden ring-blue-400 bg-blue-50 border-blue-400 hover:text-red-500"></span>
<script src="/static/js/filters.js"></script>
<script> <script>
if (document.querySelector('pre.mermaid')) { if (document.querySelector('pre.mermaid')) {
var s = document.createElement('script'); var s = document.createElement('script');

8
web/templates/pages/admin/tickets/list.html
View File

@ -10,7 +10,7 @@
<div class="flex items-center gap-4 mb-4"> <div class="flex items-center gap-4 mb-4">
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Status</label> <label class="text-xs font-medium text-gray-500 uppercase">Status</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/admin/tickets" $filters "status" ""}}" {{if not .StatusFilter}}selected{{end}}>All</option> <option value="{{filterURL "/admin/tickets" $filters "status" ""}}" {{if not .StatusFilter}}selected{{end}}>All</option>
<option value="{{filterURL "/admin/tickets" $filters "status" "open"}}" {{if eq .StatusFilter "open"}}selected{{end}}>Open</option> <option value="{{filterURL "/admin/tickets" $filters "status" "open"}}" {{if eq .StatusFilter "open"}}selected{{end}}>Open</option>
<option value="{{filterURL "/admin/tickets" $filters "status" "in_progress"}}" {{if eq .StatusFilter "in_progress"}}selected{{end}}>In Progress</option> <option value="{{filterURL "/admin/tickets" $filters "status" "in_progress"}}" {{if eq .StatusFilter "in_progress"}}selected{{end}}>In Progress</option>
@ -19,7 +19,7 @@
</div> </div>
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Priority</label> <label class="text-xs font-medium text-gray-500 uppercase">Priority</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/admin/tickets" $filters "priority" ""}}" {{if not .PriorityFilter}}selected{{end}}>All</option> <option value="{{filterURL "/admin/tickets" $filters "priority" ""}}" {{if not .PriorityFilter}}selected{{end}}>All</option>
<option value="{{filterURL "/admin/tickets" $filters "priority" "high"}}" {{if eq .PriorityFilter "high"}}selected{{end}}>High</option> <option value="{{filterURL "/admin/tickets" $filters "priority" "high"}}" {{if eq .PriorityFilter "high"}}selected{{end}}>High</option>
<option value="{{filterURL "/admin/tickets" $filters "priority" "medium"}}" {{if eq .PriorityFilter "medium"}}selected{{end}}>Medium</option> <option value="{{filterURL "/admin/tickets" $filters "priority" "medium"}}" {{if eq .PriorityFilter "medium"}}selected{{end}}>Medium</option>
@ -29,7 +29,7 @@
{{if .Products}} {{if .Products}}
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Product</label> <label class="text-xs font-medium text-gray-500 uppercase">Product</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/admin/tickets" $filters "product" ""}}" {{if not .ProductFilter}}selected{{end}}>All</option> <option value="{{filterURL "/admin/tickets" $filters "product" ""}}" {{if not .ProductFilter}}selected{{end}}>All</option>
{{range .Products}} {{range .Products}}
<option value="{{filterURL "/admin/tickets" $filters "product" .}}" {{if eq $productFilter .}}selected{{end}}>{{.}}</option> <option value="{{filterURL "/admin/tickets" $filters "product" .}}" {{if eq $productFilter .}}selected{{end}}>{{.}}</option>
@ -40,7 +40,7 @@
{{if .Reporters}} {{if .Reporters}}
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Reporter</label> <label class="text-xs font-medium text-gray-500 uppercase">Reporter</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/admin/tickets" $filters "reporter" ""}}" {{if not .ReporterFilter}}selected{{end}}>All</option> <option value="{{filterURL "/admin/tickets" $filters "reporter" ""}}" {{if not .ReporterFilter}}selected{{end}}>All</option>
{{range .Reporters}} {{range .Reporters}}
<option value="{{filterURL "/admin/tickets" $filters "reporter" .}}" {{if eq $reporterFilter .}}selected{{end}}>{{.}}</option> <option value="{{filterURL "/admin/tickets" $filters "reporter" .}}" {{if eq $reporterFilter .}}selected{{end}}>{{.}}</option>

6
web/templates/pages/tickets/list.html
View File

@ -12,7 +12,7 @@
<div class="flex items-center gap-4 mb-4"> <div class="flex items-center gap-4 mb-4">
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Status</label> <label class="text-xs font-medium text-gray-500 uppercase">Status</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/tickets" $filters "status" ""}}" {{if not .StatusFilter}}selected{{end}}>All</option> <option value="{{filterURL "/tickets" $filters "status" ""}}" {{if not .StatusFilter}}selected{{end}}>All</option>
<option value="{{filterURL "/tickets" $filters "status" "open"}}" {{if eq .StatusFilter "open"}}selected{{end}}>Open</option> <option value="{{filterURL "/tickets" $filters "status" "open"}}" {{if eq .StatusFilter "open"}}selected{{end}}>Open</option>
<option value="{{filterURL "/tickets" $filters "status" "in_progress"}}" {{if eq .StatusFilter "in_progress"}}selected{{end}}>In Progress</option> <option value="{{filterURL "/tickets" $filters "status" "in_progress"}}" {{if eq .StatusFilter "in_progress"}}selected{{end}}>In Progress</option>
@ -21,7 +21,7 @@
</div> </div>
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Priority</label> <label class="text-xs font-medium text-gray-500 uppercase">Priority</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/tickets" $filters "priority" ""}}" {{if not .PriorityFilter}}selected{{end}}>All</option> <option value="{{filterURL "/tickets" $filters "priority" ""}}" {{if not .PriorityFilter}}selected{{end}}>All</option>
<option value="{{filterURL "/tickets" $filters "priority" "high"}}" {{if eq .PriorityFilter "high"}}selected{{end}}>High</option> <option value="{{filterURL "/tickets" $filters "priority" "high"}}" {{if eq .PriorityFilter "high"}}selected{{end}}>High</option>
<option value="{{filterURL "/tickets" $filters "priority" "medium"}}" {{if eq .PriorityFilter "medium"}}selected{{end}}>Medium</option> <option value="{{filterURL "/tickets" $filters "priority" "medium"}}" {{if eq .PriorityFilter "medium"}}selected{{end}}>Medium</option>
@ -31,7 +31,7 @@
{{if .Products}} {{if .Products}}
<div class="flex items-center gap-1.5"> <div class="flex items-center gap-1.5">
<label class="text-xs font-medium text-gray-500 uppercase">Product</label> <label class="text-xs font-medium text-gray-500 uppercase">Product</label>
<select onchange="window.location.href=this.value" class="rounded-md border-gray-300 text-sm py-1.5 pr-8"> <select data-filter-nav class="rounded-md border-gray-300 text-sm py-1.5 pr-8">
<option value="{{filterURL "/tickets" $filters "product" ""}}" {{if not .ProductFilter}}selected{{end}}>All</option> <option value="{{filterURL "/tickets" $filters "product" ""}}" {{if not .ProductFilter}}selected{{end}}>All</option>
{{range .Products}} {{range .Products}}
<option value="{{filterURL "/tickets" $filters "product" .}}" {{if eq $productFilter .}}selected{{end}}>{{.}}</option> <option value="{{filterURL "/tickets" $filters "product" .}}" {{if eq $productFilter .}}selected{{end}}>{{.}}</option>