mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 08:33:27 +00:00
Fix excluding more than two labels on issues list (#14962)
* Fix excluding more than two labels on issues list Fix #14840 Signed-off-by: Andrew Thornton <art27@cantab.net> * refactor DRY * fix multiple-label filter on milestone issuelist * Apply suggestions from code review Co-authored-by: jaqra <48099350+jaqra@users.noreply.github.com> * Update web_src/js/index.js Co-authored-by: Norwin Roosen <git@nroo.de> Co-authored-by: jaqra <48099350+jaqra@users.noreply.github.com>
This commit is contained in:
parent
855a4f476e
commit
ccfb205ad1
2 changed files with 13 additions and 19 deletions
|
@ -54,7 +54,7 @@
|
||||||
<span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
|
<span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
|
||||||
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a>
|
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a>
|
||||||
{{range .Labels}}
|
{{range .Labels}}
|
||||||
<a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a>
|
<a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3753,18 +3753,21 @@ function initIssueList() {
|
||||||
fullTextSearch: true
|
fullTextSearch: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function excludeLabel (item) {
|
||||||
|
const href = $(item).attr('href');
|
||||||
|
const id = $(item).data('label-id');
|
||||||
|
|
||||||
|
const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`;
|
||||||
|
const newStr = 'labels=$1-$2$3&';
|
||||||
|
|
||||||
|
window.location = href.replace(new RegExp(regStr), newStr);
|
||||||
|
}
|
||||||
|
|
||||||
$('.menu a.label-filter-item').each(function () {
|
$('.menu a.label-filter-item').each(function () {
|
||||||
$(this).on('click', function (e) {
|
$(this).on('click', function (e) {
|
||||||
if (e.altKey) {
|
if (e.altKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
excludeLabel(this);
|
||||||
const href = $(this).attr('href');
|
|
||||||
const id = $(this).data('label-id');
|
|
||||||
|
|
||||||
const regStr = `labels=(-?[0-9]+%2c)*(${id})(%2c-?[0-9]+)*&`;
|
|
||||||
const newStr = 'labels=$1-$2$3&';
|
|
||||||
|
|
||||||
window.location = href.replace(new RegExp(regStr), newStr);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -3772,17 +3775,8 @@ function initIssueList() {
|
||||||
$('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
|
$('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
|
||||||
if (e.altKey && e.keyCode === 13) {
|
if (e.altKey && e.keyCode === 13) {
|
||||||
const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected');
|
const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected');
|
||||||
|
|
||||||
if (selectedItems.length > 0) {
|
if (selectedItems.length > 0) {
|
||||||
const item = $(selectedItems[0]);
|
excludeLabel($(selectedItems[0]));
|
||||||
|
|
||||||
const href = item.attr('href');
|
|
||||||
const id = item.data('label-id');
|
|
||||||
|
|
||||||
const regStr = `labels=(-?[0-9]+%2c)*(${id})(%2c-?[0-9]+)*&`;
|
|
||||||
const newStr = 'labels=$1-$2$3&';
|
|
||||||
|
|
||||||
window.location = href.replace(new RegExp(regStr), newStr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue