Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
516378f3
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
516378f3
编写于
12月 03, 2018
作者:
🙈
🙈 jacopo beschi 🙉
提交者:
Clement Ho
12月 03, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "Filter by `None`/`Any` for labels in issues/mrs/boards"
上级
006659e7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
8 deletion
+27
-8
app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
...ts/filtered_search/issuable_filtered_search_token_keys.js
+6
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+4
-1
changelogs/unreleased/52370-filter-by-none-any-for-labels-in-issues-mrs-boards.yml
...70-filter-by-none-any-for-labels-in-issues-mrs-boards.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/features/boards/modal_filter_spec.rb
spec/features/boards/modal_filter_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_label_spec.rb
spec/features/issues/filtered_search/dropdown_label_spec.rb
+11
-2
未找到文件。
app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
浏览文件 @
516378f3
...
...
@@ -88,10 +88,15 @@ export const conditions = [
value
:
'
started
'
,
},
{
url
:
'
label_name[]=No
+Label
'
,
url
:
'
label_name[]=No
ne
'
,
tokenKey
:
'
label
'
,
value
:
'
none
'
,
},
{
url
:
'
label_name[]=Any
'
,
tokenKey
:
'
any
'
,
value
:
'
any
'
,
},
{
url
:
'
my_reaction_emoji=None
'
,
tokenKey
:
'
my-reaction
'
,
...
...
app/views/shared/issuable/_search_bar.html.haml
浏览文件 @
516378f3
...
...
@@ -95,7 +95,10 @@
%ul
{
data:
{
dropdown:
true
}
}
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
{
type:
'button'
}
=
_
(
'No Label'
)
=
_
(
'None'
)
%li
.filter-dropdown-item
{
data:
{
value:
'any'
}
}
%button
.btn.btn-link
{
type:
'button'
}
=
_
(
'Any'
)
%li
.divider.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
...
...
changelogs/unreleased/52370-filter-by-none-any-for-labels-in-issues-mrs-boards.yml
0 → 100644
浏览文件 @
516378f3
---
title
:
Adds Any option to label filters
merge_request
:
23111
author
:
Jacopo Beschi @jacopo-beschi
type
:
added
locale/gitlab.pot
浏览文件 @
516378f3
...
...
@@ -4297,9 +4297,6 @@ msgstr ""
msgid "No"
msgstr ""
msgid "No Label"
msgstr ""
msgid "No assignee"
msgstr ""
...
...
spec/features/boards/modal_filter_spec.rb
浏览文件 @
516378f3
...
...
@@ -176,7 +176,7 @@ describe 'Issue Boards add issue modal filtering', :js do
it
'filters by no label'
do
set_filter
(
'label'
)
click_filter_link
(
'No
Label
'
)
click_filter_link
(
'No
ne
'
)
submit_filter
page
.
within
(
'.add-issues-modal'
)
do
...
...
spec/features/issues/filtered_search/dropdown_label_spec.rb
浏览文件 @
516378f3
...
...
@@ -45,7 +45,8 @@ describe 'Dropdown label', :js do
bug_label
=
create
(
:label
,
project:
project
,
title:
'bug-label'
)
init_label_search
filtered_search
.
native
.
send_keys
(
:down
,
:down
,
:enter
)
# navigate to the bug_label option and selects it
filtered_search
.
native
.
send_keys
(
:down
,
:down
,
:down
,
:enter
)
expect_tokens
([
label_token
(
bug_label
.
title
)])
expect_filtered_search_input_empty
...
...
@@ -234,12 +235,20 @@ describe 'Dropdown label', :js do
end
it
'selects `no label`'
do
find
(
"
#{
js_dropdown_label
}
.filter-dropdown-item"
,
text:
'No
Label
'
).
click
find
(
"
#{
js_dropdown_label
}
.filter-dropdown-item"
,
text:
'No
ne
'
).
click
expect
(
page
).
not_to
have_css
(
js_dropdown_label
)
expect_tokens
([
label_token
(
'none'
,
false
)])
expect_filtered_search_input_empty
end
it
'selects `any label`'
do
find
(
"
#{
js_dropdown_label
}
.filter-dropdown-item"
,
text:
'Any'
).
click
expect
(
page
).
not_to
have_css
(
js_dropdown_label
)
expect_tokens
([
label_token
(
'any'
,
false
)])
expect_filtered_search_input_empty
end
end
describe
'input has existing content'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录