From 34c503c5573995ad0df4803df86647341b0d5de7 Mon Sep 17 00:00:00 2001 From: jaqra Date: Mon, 16 Sep 2019 23:04:22 +0300 Subject: [PATCH 01/10] Add 'Alt + click' feature to exclude labels --- models/issue.go | 8 ++++++-- models/issue_label.go | 6 +++++- public/js/index.js | 17 +++++++++++++++++ templates/repo/issue/list.tmpl | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/models/issue.go b/models/issue.go index 511bfa31c411..65f547118df4 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1394,8 +1394,12 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) { if opts.LabelIDs != nil { for i, labelID := range opts.LabelIDs { - sess.Join("INNER", fmt.Sprintf("issue_label il%d", i), - fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID)) + if labelID > 0 { + sess.Join("INNER", fmt.Sprintf("issue_label il%d", i), + fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID)) + } else { + sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID) + } } } } diff --git a/models/issue_label.go b/models/issue_label.go index f378f62e654e..958bd8f7479f 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -71,6 +71,7 @@ type Label struct { IsChecked bool `xorm:"-"` QueryString string IsSelected bool + IsExcluded bool } // APIFormat converts a Label to the api.Label format @@ -96,7 +97,10 @@ func (label *Label) LoadSelectedLabelsAfterClick(currentSelectedLabels []int64) for _, s := range currentSelectedLabels { if s == label.ID { labelSelected = true - } else if s > 0 { + } else if -s == label.ID { + labelSelected = true + label.IsExcluded = true + } else if s != 0 { labelQuerySlice = append(labelQuerySlice, strconv.FormatInt(s, 10)) } } diff --git a/public/js/index.js b/public/js/index.js index d99457514b0b..2efcfa26111f 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,6 +1,7 @@ /* globals wipPrefixes, issuesTribute, emojiTribute */ /* exported timeAddManual, toggleStopwatch, cancelStopwatch, initHeatmap */ /* exported toggleDeadlineForm, setDeadline, deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */ +/* exported onLabelFilterItemClick */ 'use strict'; function htmlEncode(text) { @@ -3122,3 +3123,19 @@ function onOAuthLoginClick() { oauthNav.show(); },5000); } + +(function addLabelFilterClickEvents() { + $(".menu a.label-filter-item").each(function() { + $(this).click(function(e) { + const href = $(this).attr("href"); + const id = $(this).data("label-id"); + + if (e.altKey) { + const regStr = "labels=(-?[0-9]+%2c)*(" + id + ")(%2c-?[0-9]+)*&"; + const newStr = "labels=$1-$2$3&"; + + window.location = href.replace(new RegExp(regStr), newStr); + } + }); + }); +})(); diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 4874d97da45a..feaccd3cf89a 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -50,7 +50,7 @@
{{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} - {{.Name}} + {{.Name}} {{end}}
From d3b650bf77266997560eb572f5bdd42ee7419428 Mon Sep 17 00:00:00 2001 From: jaqra Date: Tue, 17 Sep 2019 00:42:02 +0300 Subject: [PATCH 02/10] :lipstick: --- public/js/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 2efcfa26111f..1a9f941b5345 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,7 +1,6 @@ /* globals wipPrefixes, issuesTribute, emojiTribute */ /* exported timeAddManual, toggleStopwatch, cancelStopwatch, initHeatmap */ /* exported toggleDeadlineForm, setDeadline, deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */ -/* exported onLabelFilterItemClick */ 'use strict'; function htmlEncode(text) { @@ -3127,10 +3126,10 @@ function onOAuthLoginClick() { (function addLabelFilterClickEvents() { $(".menu a.label-filter-item").each(function() { $(this).click(function(e) { - const href = $(this).attr("href"); - const id = $(this).data("label-id"); - if (e.altKey) { + 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&"; From 1324fbc2761982837b00fe865d967af668f453a7 Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 00:39:07 +0300 Subject: [PATCH 03/10] Add info --- public/css/index.css | 2 ++ public/less/_repository.less | 18 ++++++++++++++++++ templates/repo/issue/list.tmpl | 1 + 3 files changed, 21 insertions(+) diff --git a/public/css/index.css b/public/css/index.css index 113fdbf6318a..ae4250aa14d2 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -452,6 +452,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px} .repository .filter.menu .octicon{float:left;margin:5px -7px 0 -5px;width:16px} .repository .filter.menu.labels .octicon{margin:-2px -7px 0 -5px} +.repository .filter.menu.labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} +.repository .filter.menu.labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} .repository .filter.menu .text{margin-left:.9em} .repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important} .repository .filter.menu .dropdown.item{margin:1px;padding-right:0} diff --git a/public/less/_repository.less b/public/less/_repository.less index 74ca683c4e53..bbe6af451152 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -158,6 +158,24 @@ margin: -2px -7px 0 -5px; } + &.labels { + .menu .info { + display: inline-block; + padding: 9px 7px 7px 7px; + text-align: center; + border-bottom: 1px solid #cccccc; + font-size: 12px; + + code { + border: 1px solid #cccccc; + border-radius: 3px; + background: #ffffff; + padding: 3px 2px 1px 2px; + font-size: 11px; + } + } + } + .text { margin-left: 0.9em; } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index feaccd3cf89a..28632ee754bd 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -48,6 +48,7 @@
+ Use alt + click/enter to exclude labels {{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} {{.Name}} From 6e36ac08e7bf5f9c0346efb811cdf17c74a84b30 Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 01:03:00 +0300 Subject: [PATCH 04/10] fix label colors --- public/css/index.css | 4 ++-- public/less/_repository.less | 2 +- templates/repo/issue/list.tmpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index ae4250aa14d2..d1e2f23e734c 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -452,8 +452,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px} .repository .filter.menu .octicon{float:left;margin:5px -7px 0 -5px;width:16px} .repository .filter.menu.labels .octicon{margin:-2px -7px 0 -5px} -.repository .filter.menu.labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} -.repository .filter.menu.labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} +.repository .filter.menu.filter-labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} +.repository .filter.menu.filter-labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} .repository .filter.menu .text{margin-left:.9em} .repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important} .repository .filter.menu .dropdown.item{margin:1px;padding-right:0} diff --git a/public/less/_repository.less b/public/less/_repository.less index bbe6af451152..de9830a9b179 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -158,7 +158,7 @@ margin: -2px -7px 0 -5px; } - &.labels { + &.filter-labels { .menu .info { display: inline-block; padding: 9px 7px 7px 7px; diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 28632ee754bd..157333a4b3e4 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -42,7 +42,7 @@
-
+
{{.i18n.Tr "repo.issues.filter_label"}} From 65076acbdc64a29c3e783aeaa255135d9bcda975 Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 01:09:51 +0300 Subject: [PATCH 05/10] fix info css --- public/css/index.css | 4 ++-- public/less/_repository.less | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index d1e2f23e734c..fc0ac9247305 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -452,8 +452,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px} .repository .filter.menu .octicon{float:left;margin:5px -7px 0 -5px;width:16px} .repository .filter.menu.labels .octicon{margin:-2px -7px 0 -5px} -.repository .filter.menu.filter-labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} -.repository .filter.menu.filter-labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} +.repository .filter.menu.labels .filter-labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} +.repository .filter.menu.labels .filter-labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} .repository .filter.menu .text{margin-left:.9em} .repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important} .repository .filter.menu .dropdown.item{margin:1px;padding-right:0} diff --git a/public/less/_repository.less b/public/less/_repository.less index de9830a9b179..0588d495a996 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -158,8 +158,8 @@ margin: -2px -7px 0 -5px; } - &.filter-labels { - .menu .info { + &.labels { + .filter-labels .menu .info { display: inline-block; padding: 9px 7px 7px 7px; text-align: center; From 8a2d9f6c0fd3a6a4d3cd7a53eaa9fef7dcdb0b27 Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 01:31:32 +0300 Subject: [PATCH 06/10] mave funtion and add enter event --- public/js/index.js | 51 ++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 1a9f941b5345..b7b5b430f73d 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -3096,8 +3096,39 @@ function initIssueList() { }, fullTextSearch: true - }) - ; + }); + + $(".menu a.label-filter-item").each(function() { + $(this).click(function(e) { + if (e.altKey) { + 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); + } + }); + }); + + $(".menu .ui.dropdown.filter-labels").keydown(function(e) { + if (e.altKey && e.keyCode == 13) { + const selectedItems = $(".menu .ui.dropdown.filter-labels .menu .item.selected"); + + if (selectedItems.length > 0) { + const item = $(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); + } + } + }); } function cancelCodeComment(btn) { const form = $(btn).closest("form"); @@ -3122,19 +3153,3 @@ function onOAuthLoginClick() { oauthNav.show(); },5000); } - -(function addLabelFilterClickEvents() { - $(".menu a.label-filter-item").each(function() { - $(this).click(function(e) { - if (e.altKey) { - 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); - } - }); - }); -})(); From d0fc7bc3b59e77c9034ed9131804a67b60cfde8a Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 01:35:27 +0300 Subject: [PATCH 07/10] change class name --- public/css/index.css | 4 ++-- public/js/index.js | 4 ++-- public/less/_repository.less | 3 +-- templates/repo/issue/list.tmpl | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index fc0ac9247305..669e88c455e3 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -452,8 +452,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository .filter.menu .label.color{border-radius:3px;margin-left:15px;padding:0 8px} .repository .filter.menu .octicon{float:left;margin:5px -7px 0 -5px;width:16px} .repository .filter.menu.labels .octicon{margin:-2px -7px 0 -5px} -.repository .filter.menu.labels .filter-labels .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} -.repository .filter.menu.labels .filter-labels .menu .info code{border:1px solid #ccc;border-radius:3px;background:#fff;padding:3px 2px 1px 2px;font-size:11px} +.repository .filter.menu.labels .label-filter .menu .info{display:inline-block;padding:9px 7px 7px 7px;text-align:center;border-bottom:1px solid #ccc;font-size:12px} +.repository .filter.menu.labels .label-filter .menu .info code{border:1px solid #ccc;border-radius:3px;padding:3px 2px 1px 2px;font-size:11px} .repository .filter.menu .text{margin-left:.9em} .repository .filter.menu .menu{max-height:300px;overflow-x:auto;right:0!important;left:auto!important} .repository .filter.menu .dropdown.item{margin:1px;padding-right:0} diff --git a/public/js/index.js b/public/js/index.js index b7b5b430f73d..93cd7097f7df 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -3112,9 +3112,9 @@ function initIssueList() { }); }); - $(".menu .ui.dropdown.filter-labels").keydown(function(e) { + $(".menu .ui.dropdown.label-filter").keydown(function(e) { if (e.altKey && e.keyCode == 13) { - const selectedItems = $(".menu .ui.dropdown.filter-labels .menu .item.selected"); + const selectedItems = $(".menu .ui.dropdown.label-filter .menu .item.selected"); if (selectedItems.length > 0) { const item = $(selectedItems[0]); diff --git a/public/less/_repository.less b/public/less/_repository.less index 0588d495a996..133297473937 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -159,7 +159,7 @@ } &.labels { - .filter-labels .menu .info { + .label-filter .menu .info { display: inline-block; padding: 9px 7px 7px 7px; text-align: center; @@ -169,7 +169,6 @@ code { border: 1px solid #cccccc; border-radius: 3px; - background: #ffffff; padding: 3px 2px 1px 2px; font-size: 11px; } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 157333a4b3e4..32c0f92bc45f 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -42,7 +42,7 @@
-
+
{{.i18n.Tr "repo.issues.filter_label"}} From afa694433a13587c77f80183bfadaef46fce20ab Mon Sep 17 00:00:00 2001 From: jaqra Date: Thu, 17 Oct 2019 01:39:38 +0300 Subject: [PATCH 08/10] add message to locale --- options/locale/locale_en-US.ini | 1 + templates/repo/issue/list.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8a1dc95b9fa1..af6008eb304c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -784,6 +784,7 @@ issues.delete_branch_at = `deleted branch %s %s` issues.open_tab = %d Open issues.close_tab = %d Closed issues.filter_label = Label +issues.filter_label_exclude = `Use alt + click/enter to exclude labels` issues.filter_label_no_select = All labels issues.filter_milestone = Milestone issues.filter_milestone_no_select = All milestones diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 32c0f92bc45f..351b4a7e0478 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -48,7 +48,7 @@
- Use alt + click/enter to exclude labels + {{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}} {{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} {{.Name}} From e714635ffb59b72cc8b364ec0c1d5941ca95ac05 Mon Sep 17 00:00:00 2001 From: jaqra <48099350+jaqra@users.noreply.github.com> Date: Sat, 19 Oct 2019 11:18:22 +0300 Subject: [PATCH 09/10] Add `xorm:"-"` for Label.IsExcluded struct --- models/issue_label.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue_label.go b/models/issue_label.go index 958bd8f7479f..abeaa8add86d 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -71,7 +71,7 @@ type Label struct { IsChecked bool `xorm:"-"` QueryString string IsSelected bool - IsExcluded bool + IsExcluded bool `xorm:"-"` } // APIFormat converts a Label to the api.Label format From f723afe3b01199d3dc51826b22a9fffd90010e1e Mon Sep 17 00:00:00 2001 From: jaqra <48099350+jaqra@users.noreply.github.com> Date: Wed, 23 Oct 2019 15:19:13 +0300 Subject: [PATCH 10/10] try to fix format --- models/issue_label.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue_label.go b/models/issue_label.go index 89aa32230595..1fc873cfd44a 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -61,8 +61,8 @@ func GetLabelTemplateFile(name string) ([][3]string, error) { // Label represents a label of repository for issues. type Label struct { - ID int64 `xorm:"pk autoincr"` - RepoID int64 `xorm:"INDEX"` + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX"` Name string Description string Color string `xorm:"VARCHAR(7)"`