From c26992e2ca93d7d0d3add21035bcd121af18c449 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 23 Oct 2023 15:31:55 +0530 Subject: [PATCH 1/3] Regression #27466 --- templates/repo/issue/filter_list.tmpl | 2 +- templates/repo/issue/labels/labels_selector_field.tmpl | 6 +++--- web_src/js/features/repo-issue-list.js | 3 +++ web_src/js/features/repo-issue.js | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 511ef7f397..33b0d07281 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -29,7 +29,7 @@ {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}} diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index d24dac46eb..8041c88192 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -18,7 +18,7 @@ {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}}
{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} @@ -26,12 +26,12 @@

{{template "repo/issue/labels/label_archived" .}}

{{end}} -
+
{{$previousExclusiveScope = "_no_scope"}} {{range .OrgLabels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}} {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index ca20cfbe38..59071f15fa 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -206,6 +206,9 @@ function initArchivedLabelFilter() { for (const label of archivedLabels) { const id = label.getAttribute('data-label-id'); toggleElem(label, archivedLabelEl.checked || selectedLabels.includes(id)); + // also toggle the divider + const divider = $(label).next('.exclusive-scope'); + toggleElem(divider, archivedLabelEl.checked || selectedLabels.includes(id)); } }; diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 2cc0730af6..418c631302 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -691,5 +691,8 @@ export function initArchivedLabelHandler() { if (!document.querySelector('.archived-label-hint')) return; for (const label of document.querySelectorAll('[data-is-archived]')) { toggleElem(label, label.classList.contains('checked')); + // also toggle the divider + const divider = $(label).next('.exclusive-scope'); + toggleElem(divider, label.classList.contains('checked')); } } From 9d18875758f1f2cdd48c9149007742d81841536a Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 23 Oct 2023 16:09:10 +0530 Subject: [PATCH 3/3] Removing redundant variable. --- web_src/js/features/repo-issue-list.js | 3 +-- web_src/js/features/repo-issue.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 59071f15fa..e11f7cc920 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -207,8 +207,7 @@ function initArchivedLabelFilter() { const id = label.getAttribute('data-label-id'); toggleElem(label, archivedLabelEl.checked || selectedLabels.includes(id)); // also toggle the divider - const divider = $(label).next('.exclusive-scope'); - toggleElem(divider, archivedLabelEl.checked || selectedLabels.includes(id)); + toggleElem($(label).next('.exclusive-scope'), archivedLabelEl.checked || selectedLabels.includes(id)); } }; diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 418c631302..ca58c3944d 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -692,7 +692,6 @@ export function initArchivedLabelHandler() { for (const label of document.querySelectorAll('[data-is-archived]')) { toggleElem(label, label.classList.contains('checked')); // also toggle the divider - const divider = $(label).next('.exclusive-scope'); - toggleElem(divider, label.classList.contains('checked')); + toggleElem($(label).next('.exclusive-scope'), label.classList.contains('checked')); } }