Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8d19f4b4
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 搜索 >>
未验证
提交
8d19f4b4
编写于
9月 10, 2018
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add sort dropdown to project labels page and group labels page
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
a5517ada
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
142 addition
and
2 deletion
+142
-2
app/controllers/groups/labels_controller.rb
app/controllers/groups/labels_controller.rb
+5
-0
app/controllers/projects/labels_controller.rb
app/controllers/projects/labels_controller.rb
+6
-1
app/finders/labels_finder.rb
app/finders/labels_finder.rb
+5
-1
app/helpers/sorting_helper.rb
app/helpers/sorting_helper.rb
+11
-0
app/models/label.rb
app/models/label.rb
+3
-0
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-0
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-0
app/views/shared/labels/_sort_dropdown.html.haml
app/views/shared/labels/_sort_dropdown.html.haml
+9
-0
changelogs/unreleased/50835-add-filtering-sorting-for-labels-on-labels-page.yml
...50835-add-filtering-sorting-for-labels-on-labels-page.yml
+5
-0
spec/features/groups/labels/sort_labels_spec.rb
spec/features/groups/labels/sort_labels_spec.rb
+48
-0
spec/features/projects/labels/sort_labels_spec.rb
spec/features/projects/labels/sort_labels_spec.rb
+48
-0
未找到文件。
app/controllers/groups/labels_controller.rb
浏览文件 @
8d19f4b4
...
...
@@ -12,6 +12,7 @@ class Groups::LabelsController < Groups::ApplicationController
format
.
html
do
@labels
=
@group
.
labels
.
optionally_search
(
params
[
:search
])
.
order_by
(
sort
)
.
page
(
params
[
:page
])
end
format
.
json
do
...
...
@@ -117,4 +118,8 @@ class Groups::LabelsController < Groups::ApplicationController
include_descendant_groups:
params
[
:include_descendant_groups
],
search:
params
[
:search
]).
execute
end
def
sort
@sort
||=
params
[
:sort
]
||
'name_asc'
end
end
app/controllers/projects/labels_controller.rb
浏览文件 @
8d19f4b4
...
...
@@ -163,7 +163,12 @@ class Projects::LabelsController < Projects::ApplicationController
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
,
include_ancestor_groups:
params
[
:include_ancestor_groups
],
search:
params
[
:search
]).
execute
search:
params
[
:search
],
sort:
sort
).
execute
end
def
sort
@sort
||=
params
[
:sort
]
||
'name_asc'
end
def
authorize_admin_labels!
...
...
app/finders/labels_finder.rb
浏览文件 @
8d19f4b4
...
...
@@ -54,8 +54,12 @@ class LabelsFinder < UnionFinder
end
def
sort
(
items
)
if
params
[
:sort
]
items
.
order_by
(
params
[
:sort
])
else
items
.
reorder
(
title: :asc
)
end
end
def
with_title
(
items
)
return
items
if
title
.
nil?
...
...
app/helpers/sorting_helper.rb
浏览文件 @
8d19f4b4
...
...
@@ -101,6 +101,17 @@ module SortingHelper
}
end
def
label_sort_options_hash
{
sort_value_name
=>
sort_title_name
,
sort_value_name_desc
=>
sort_title_name_desc
,
sort_value_recently_created
=>
sort_title_recently_created
,
sort_value_oldest_created
=>
sort_title_oldest_created
,
sort_value_recently_updated
=>
sort_title_recently_updated
,
sort_value_oldest_updated
=>
sort_title_oldest_updated
}
end
def
sortable_item
(
item
,
path
,
sorted_by
)
link_to
item
,
path
,
class:
sorted_by
==
item
?
'is-active'
:
''
end
...
...
app/models/label.rb
浏览文件 @
8d19f4b4
...
...
@@ -6,6 +6,7 @@ class Label < ActiveRecord::Base
include
Subscribable
include
Gitlab
::
SQL
::
Pattern
include
OptionallySearch
include
Sortable
# Represents a "No Label" state used for filtering Issues and Merge
# Requests that have no label assigned.
...
...
@@ -41,6 +42,8 @@ class Label < ActiveRecord::Base
scope
:with_lists_and_board
,
->
{
joins
(
lists: :board
).
merge
(
List
.
movable
)
}
scope
:on_group_boards
,
->
(
group_id
)
{
with_lists_and_board
.
where
(
boards:
{
group_id:
group_id
})
}
scope
:on_project_boards
,
->
(
project_id
)
{
with_lists_and_board
.
where
(
boards:
{
project_id:
project_id
})
}
scope
:order_name_asc
,
->
{
reorder
(
title: :asc
)
}
scope
:order_name_desc
,
->
{
reorder
(
title: :desc
)
}
def
self
.
prioritized
(
project
)
joins
(
:priorities
)
...
...
app/views/groups/labels/index.html.haml
浏览文件 @
8d19f4b4
...
...
@@ -22,6 +22,7 @@
%span
.input-group-append
%button
.btn.btn-default
{
type:
"submit"
,
"aria-label"
=>
_
(
'Submit search'
)
}
=
icon
(
"search"
)
=
render
'shared/labels/sort_dropdown'
.labels-container.prepend-top-5
-
if
@labels
.
any?
...
...
app/views/projects/labels/index.html.haml
浏览文件 @
8d19f4b4
...
...
@@ -22,6 +22,7 @@
%span
.input-group-append
%button
.btn.btn-default
{
type:
"submit"
,
"aria-label"
=>
_
(
'Submit search'
)
}
=
icon
(
"search"
)
=
render
'shared/labels/sort_dropdown'
.labels-container.prepend-top-10
-
if
can_admin_label
...
...
app/views/shared/labels/_sort_dropdown.html.haml
0 → 100644
浏览文件 @
8d19f4b4
-
sort_title
=
label_sort_options_hash
[
@sort
]
||
sort_title_name_desc
.dropdown.inline
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
=
sort_title
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-sort
%li
-
label_sort_options_hash
.
each
do
|
value
,
title
|
=
sortable_item
(
title
,
page_filter_path
(
sort:
value
,
label:
true
),
sort_title
)
changelogs/unreleased/50835-add-filtering-sorting-for-labels-on-labels-page.yml
0 → 100644
浏览文件 @
8d19f4b4
---
title
:
Add sorting for labels on labels page
merge_request
:
21642
author
:
type
:
added
spec/features/groups/labels/sort_labels_spec.rb
0 → 100644
浏览文件 @
8d19f4b4
# frozen_string_literal: true
require
'spec_helper'
describe
'Sort labels'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let!
(
:label1
)
{
create
(
:group_label
,
title:
'Foo'
,
description:
'Lorem ipsum'
,
group:
group
)
}
let!
(
:label2
)
{
create
(
:group_label
,
title:
'Bar'
,
description:
'Fusce consequat'
,
group:
group
)
}
before
do
group
.
add_maintainer
(
user
)
sign_in
(
user
)
visit
group_labels_path
(
group
)
end
it
'sorts by title by default'
do
expect
(
page
).
to
have_button
(
'Name'
)
# assert default sorting
within
'.other-labels'
do
expect
(
page
.
all
(
'.label-list-item'
).
first
.
text
).
to
include
(
'Bar'
)
expect
(
page
.
all
(
'.label-list-item'
).
last
.
text
).
to
include
(
'Foo'
)
end
end
it
'sorts by date'
do
click_button
'Name'
sort_options
=
find
(
'ul.dropdown-menu-sort li'
).
all
(
'a'
).
collect
(
&
:text
)
expect
(
sort_options
[
0
]).
to
eq
(
'Name'
)
expect
(
sort_options
[
1
]).
to
eq
(
'Name, descending'
)
expect
(
sort_options
[
2
]).
to
eq
(
'Last created'
)
expect
(
sort_options
[
3
]).
to
eq
(
'Oldest created'
)
expect
(
sort_options
[
4
]).
to
eq
(
'Last updated'
)
expect
(
sort_options
[
5
]).
to
eq
(
'Oldest updated'
)
click_link
'Name, descending'
# assert default sorting
within
'.other-labels'
do
expect
(
page
.
all
(
'.label-list-item'
).
first
.
text
).
to
include
(
'Foo'
)
expect
(
page
.
all
(
'.label-list-item'
).
last
.
text
).
to
include
(
'Bar'
)
end
end
end
spec/features/projects/labels/sort_labels_spec.rb
0 → 100644
浏览文件 @
8d19f4b4
# frozen_string_literal: true
require
'spec_helper'
describe
'Sort labels'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let!
(
:label1
)
{
create
(
:label
,
title:
'Foo'
,
description:
'Lorem ipsum'
,
project:
project
)
}
let!
(
:label2
)
{
create
(
:label
,
title:
'Bar'
,
description:
'Fusce consequat'
,
project:
project
)
}
before
do
project
.
add_maintainer
(
user
)
sign_in
(
user
)
visit
project_labels_path
(
project
)
end
it
'sorts by title by default'
do
expect
(
page
).
to
have_button
(
'Name'
)
# assert default sorting
within
'.other-labels'
do
expect
(
page
.
all
(
'.label-list-item'
).
first
.
text
).
to
include
(
'Bar'
)
expect
(
page
.
all
(
'.label-list-item'
).
last
.
text
).
to
include
(
'Foo'
)
end
end
it
'sorts by date'
do
click_button
'Name'
sort_options
=
find
(
'ul.dropdown-menu-sort li'
).
all
(
'a'
).
collect
(
&
:text
)
expect
(
sort_options
[
0
]).
to
eq
(
'Name'
)
expect
(
sort_options
[
1
]).
to
eq
(
'Name, descending'
)
expect
(
sort_options
[
2
]).
to
eq
(
'Last created'
)
expect
(
sort_options
[
3
]).
to
eq
(
'Oldest created'
)
expect
(
sort_options
[
4
]).
to
eq
(
'Last updated'
)
expect
(
sort_options
[
5
]).
to
eq
(
'Oldest updated'
)
click_link
'Name, descending'
# assert default sorting
within
'.other-labels'
do
expect
(
page
.
all
(
'.label-list-item'
).
first
.
text
).
to
include
(
'Foo'
)
expect
(
page
.
all
(
'.label-list-item'
).
last
.
text
).
to
include
(
'Bar'
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录