Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cd6c3adf
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 搜索 >>
提交
cd6c3adf
编写于
8月 12, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reverted milestone upcoming default filter
上级
f4c9d514
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
35 deletion
+26
-35
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+1
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+2
-6
app/views/projects/boards/show.html.haml
app/views/projects/boards/show.html.haml
+1
-1
app/views/shared/issuable/_milestone_dropdown.html.haml
app/views/shared/issuable/_milestone_dropdown.html.haml
+1
-5
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+21
-22
未找到文件。
app/assets/javascripts/boards/stores/boards_store.js.es6
浏览文件 @
cd6c3adf
...
...
@@ -7,7 +7,7 @@
this.state.filters = {
author_id: gl.utils.getParameterValues('author_id')[0],
assignee_id: gl.utils.getParameterValues('assignee_id')[0],
milestone_title: gl.utils.getParameterValues('milestone_title')[0]
|| '#upcoming'
,
milestone_title: gl.utils.getParameterValues('milestone_title')[0],
label_name: gl.utils.getParameterValues('label_name[]')
};
},
...
...
app/helpers/issuables_helper.rb
浏览文件 @
cd6c3adf
...
...
@@ -49,16 +49,12 @@ module IssuablesHelper
end
end
def
milestone_dropdown_label
(
milestone_title
,
is_boards
,
default_label
=
"Milestone"
)
def
milestone_dropdown_label
(
milestone_title
,
default_label
=
"Milestone"
)
if
milestone_title
==
Milestone
::
Upcoming
.
name
milestone_title
=
Milestone
::
Upcoming
.
title
end
if
is_boards
boards_default
=
Milestone
::
Upcoming
.
title
end
h
(
milestone_title
.
presence
||
boards_default
||
default_label
)
h
(
milestone_title
.
presence
||
default_label
)
end
def
issuable_meta
(
issuable
,
project
,
text
)
...
...
app/views/projects/boards/show.html.haml
浏览文件 @
cd6c3adf
...
...
@@ -4,7 +4,7 @@
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'boards/boards_bundle.js'
)
=
page_specific_javascript_tag
(
'boards/test_utils/simulate_drag.js'
)
=
page_specific_javascript_tag
(
'boards/test_utils/simulate_drag.js'
)
if
Rails
.
env
.
test?
=
render
"projects/issues/head"
...
...
app/views/shared/issuable/_milestone_dropdown.html.haml
浏览文件 @
cd6c3adf
-
is_boards
=
controller
.
controller_name
==
'boards'
-
if
params
[
:milestone_title
].
present?
=
hidden_field_tag
(
:milestone_title
,
params
[
:milestone_title
])
-
elsif
is_boards
=
hidden_field_tag
(
:milestone_title
,
Milestone
::
Upcoming
.
name
)
=
dropdown_tag
(
milestone_dropdown_label
(
params
[
:milestone_title
],
is_boards
),
options:
{
title:
"Filter by milestone"
,
toggle_class:
'js-milestone-select js-filter-submit'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable"
,
=
dropdown_tag
(
milestone_dropdown_label
(
params
[
:milestone_title
]),
options:
{
title:
"Filter by milestone"
,
toggle_class:
'js-milestone-select js-filter-submit'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable"
,
placeholder:
"Search milestones"
,
footer_content:
@project
.
present?
,
data:
{
show_no:
true
,
show_any:
true
,
show_upcoming:
true
,
field_name:
"milestone_title"
,
selected:
params
[
:milestone_title
],
project_id:
@project
.
try
(
:id
),
milestones:
milestones_filter_dropdown_path
,
default_label:
"Milestone"
}
})
do
-
if
@project
%ul
.dropdown-footer-list
...
...
spec/features/boards/boards_spec.rb
浏览文件 @
cd6c3adf
...
...
@@ -44,7 +44,6 @@ describe 'Issue Boards', feature: true, js: true do
end
context
'with lists'
do
let!
(
:milestone_upcoming
)
{
create
(
:milestone
,
project:
project
,
due_date:
Date
.
tomorrow
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
...
...
@@ -55,16 +54,16 @@ describe 'Issue Boards', feature: true, js: true do
let!
(
:list1
)
{
create
(
:list
,
board:
project
.
board
,
label:
planning
,
position:
0
)
}
let!
(
:list2
)
{
create
(
:list
,
board:
project
.
board
,
label:
development
,
position:
1
)
}
let!
(
:confidential_issue
)
{
create
(
:issue
,
:confidential
,
project:
project
,
author:
user
,
milestone:
milestone_upcoming
)
}
let!
(
:issue1
)
{
create
(
:issue
,
project:
project
,
assignee:
user
,
milestone:
milestone_upcoming
)
}
let!
(
:issue2
)
{
create
(
:issue
,
project:
project
,
author:
user2
,
milestone:
milestone_upcoming
)
}
let!
(
:issue3
)
{
create
(
:issue
,
project:
project
,
milestone:
milestone_upcoming
)
}
let!
(
:issue4
)
{
create
(
:issue
,
project:
project
,
milestone:
milestone_upcoming
)
}
let!
(
:confidential_issue
)
{
create
(
:issue
,
:confidential
,
project:
project
,
author:
user
)
}
let!
(
:issue1
)
{
create
(
:issue
,
project:
project
,
assignee:
user
)
}
let!
(
:issue2
)
{
create
(
:issue
,
project:
project
,
author:
user2
)
}
let!
(
:issue3
)
{
create
(
:issue
,
project:
project
)
}
let!
(
:issue4
)
{
create
(
:issue
,
project:
project
)
}
let!
(
:issue5
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
planning
],
milestone:
milestone
)
}
let!
(
:issue6
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
planning
,
development
]
,
milestone:
milestone_upcoming
)
}
let!
(
:issue7
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
]
,
milestone:
milestone_upcoming
)
}
let!
(
:issue6
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
planning
,
development
])
}
let!
(
:issue7
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
])
}
let!
(
:issue8
)
{
create
(
:closed_issue
,
project:
project
,
milestone:
milestone_upcoming
)
}
let!
(
:issue9
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
,
bug
]
,
milestone:
milestone_upcoming
)
}
let!
(
:issue9
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
,
bug
])
}
before
do
visit
namespace_project_board_path
(
project
.
namespace
,
project
)
...
...
@@ -78,8 +77,8 @@ describe 'Issue Boards', feature: true, js: true do
it
'shows issues in lists'
do
page
.
within
(
all
(
'.board'
)[
1
])
do
expect
(
page
.
find
(
'.board-header'
)).
to
have_content
(
'
1
'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
page
.
find
(
'.board-header'
)).
to
have_content
(
'
2
'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
2
)
end
page
.
within
(
all
(
'.board'
)[
2
])
do
...
...
@@ -103,7 +102,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'infinite scrolls list'
do
50
.
times
do
create
(
:issue
,
project:
project
,
milestone:
milestone_upcoming
)
create
(
:issue
,
project:
project
)
end
visit
namespace_project_board_path
(
project
.
namespace
,
project
)
...
...
@@ -157,8 +156,8 @@ describe 'Issue Boards', feature: true, js: true do
end
page
.
within
(
all
(
'.board'
)[
1
])
do
expect
(
page
.
find
(
'.board-header'
)).
to
have_content
(
'
2
'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
2
)
expect
(
page
.
find
(
'.board-header'
)).
to
have_content
(
'
3
'
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
3
)
end
end
end
...
...
@@ -179,7 +178,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'removes all of the same issue to done'
do
drag_to
(
list_from_index:
1
,
list_to_index:
3
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
0
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
all
(
'.board'
)[
2
]).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
all
(
'.board'
).
last
).
to
have_content
(
issue6
.
title
)
expect
(
all
(
'.board'
).
last
).
not_to
have_content
(
planning
.
title
)
...
...
@@ -195,10 +194,10 @@ describe 'Issue Boards', feature: true, js: true do
end
it
'moves between lists'
do
drag_to
(
list_from_index:
1
,
list_to_index:
2
)
drag_to
(
list_from_index:
1
,
card_index:
1
,
list_to_index:
2
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
0
)
expect
(
all
(
'.board'
)[
2
]).
to
have_selector
(
'.card'
,
count:
2
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
all
(
'.board'
)[
2
]).
to
have_selector
(
'.card'
,
count:
3
)
expect
(
all
(
'.board'
)[
2
]).
to
have_content
(
issue6
.
title
)
expect
(
all
(
'.board'
)[
2
].
all
(
'.card'
).
last
).
not_to
have_content
(
development
.
title
)
end
...
...
@@ -206,7 +205,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'moves between lists'
do
drag_to
(
list_from_index:
2
,
list_to_index:
1
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
2
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
3
)
expect
(
all
(
'.board'
)[
2
]).
to
have_selector
(
'.card'
,
count:
1
)
expect
(
all
(
'.board'
)[
1
]).
to
have_content
(
issue7
.
title
)
expect
(
all
(
'.board'
)[
1
].
all
(
'.card'
).
first
).
not_to
have_content
(
planning
.
title
)
...
...
@@ -215,7 +214,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'moves from done'
do
drag_to
(
list_from_index:
3
,
list_to_index:
1
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
2
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
3
)
expect
(
all
(
'.board'
)[
1
]).
to
have_content
(
issue8
.
title
)
end
...
...
@@ -315,7 +314,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'filters by milestone'
do
page
.
within
'.issues-filters'
do
click_button
(
'
Upcoming
'
)
click_button
(
'
Milestone
'
)
page
.
within
'.milestone-filter'
do
click_link
(
milestone
.
title
)
...
...
@@ -358,7 +357,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'infinite scrolls list with label filter'
do
50
.
times
do
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
]
,
milestone:
milestone_upcoming
)
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
])
end
page
.
within
'.issues-filters'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录