Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fdc94907
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,发现更多精彩内容 >>
提交
fdc94907
编写于
4月 15, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed issue with not being able to sort and filter
上级
471d7a5b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
3 deletion
+47
-3
app/assets/javascripts/issuable.js.coffee
app/assets/javascripts/issuable.js.coffee
+1
-1
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+11
-2
spec/features/issues/filter_issues_spec.rb
spec/features/issues/filter_issues_spec.rb
+35
-0
未找到文件。
app/assets/javascripts/issuable.js.coffee
浏览文件 @
fdc94907
...
...
@@ -69,7 +69,7 @@ issuable_created = false
updateStateFilters
:
->
stateFilters
=
$
(
'.issues-state-filters'
)
stateFilters
=
$
(
'.issues-state-filters
, .dropdown-menu-sort
'
)
newParams
=
{}
paramKeys
=
[
'author_id'
,
'milestone_title'
,
'assignee_id'
,
'issue_search'
]
...
...
app/views/shared/_sort_dropdown.html.haml
浏览文件 @
fdc94907
...
...
@@ -6,26 +6,35 @@
-
else
=
sort_title_recently_created
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
%ul
.dropdown-menu.dropdown-menu-align-right
.dropdown-menu-sort
%li
=
link_to
page_filter_path
(
sort:
sort_value_recently_created
)
do
=
sort_title_recently_created
%li
=
link_to
page_filter_path
(
sort:
sort_value_oldest_created
)
do
=
sort_title_oldest_created
%li
=
link_to
page_filter_path
(
sort:
sort_value_recently_updated
)
do
=
sort_title_recently_updated
%li
=
link_to
page_filter_path
(
sort:
sort_value_oldest_updated
)
do
=
sort_title_oldest_updated
%li
=
link_to
page_filter_path
(
sort:
sort_value_milestone_soon
)
do
=
sort_title_milestone_soon
%li
=
link_to
page_filter_path
(
sort:
sort_value_milestone_later
)
do
=
sort_title_milestone_later
-
if
controller
.
controller_name
==
'issues'
||
controller
.
action_name
==
'issues'
-
if
controller
.
controller_name
==
'issues'
||
controller
.
action_name
==
'issues'
%li
=
link_to
page_filter_path
(
sort:
sort_value_due_date_soon
)
do
=
sort_title_due_date_soon
%li
=
link_to
page_filter_path
(
sort:
sort_value_due_date_later
)
do
=
sort_title_due_date_later
%li
=
link_to
page_filter_path
(
sort:
sort_value_upvotes
)
do
=
sort_title_upvotes
%li
=
link_to
page_filter_path
(
sort:
sort_value_downvotes
)
do
=
sort_title_downvotes
spec/features/issues/filter_issues_spec.rb
浏览文件 @
fdc94907
...
...
@@ -190,7 +190,9 @@ describe 'Filter issues', feature: true do
expect
(
page
).
to_not
have_selector
(
'.issue'
)
end
end
end
context
'text and dropdown options'
,
js:
true
do
it
'should filter by text and label'
do
fill_in
'issue_search'
,
with:
'Bug'
...
...
@@ -260,4 +262,37 @@ describe 'Filter issues', feature: true do
end
end
end
describe
'filter issues and sort'
,
js:
true
do
before
do
label
=
create
(
:label
,
project:
project
,
title:
'bug'
)
bug_one
=
create
(
:issue
,
title:
"Frontend"
,
project:
project
)
bug_two
=
create
(
:issue
,
title:
"Bug 2"
,
project:
project
)
bug_one
.
labels
<<
project
.
labels
.
find_by
(
title:
'bug'
)
bug_two
.
labels
<<
project
.
labels
.
find_by
(
title:
'bug'
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
)
end
it
'should be able to filter and sort issues'
do
click_button
'Label'
page
.
within
'.labels-filter'
do
click_link
'bug'
end
page
.
within
'.issues-list'
do
expect
(
page
).
to
have_selector
(
'.issue'
,
count:
2
)
end
click_button
'Last created'
page
.
within
'.dropdown-menu-sort'
do
click_link
'Oldest created'
end
page
.
within
'.issues-list'
do
expect
(
first
(
'.issue'
)).
to
have_content
(
'Frontend'
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录