Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
88024b17
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 搜索 >>
提交
88024b17
编写于
3月 24, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Standardised the output of the JSON to always include the name
The frontend will then always use the name as the ID - like previous
上级
3aeda8c9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
14 deletion
+31
-14
app/assets/javascripts/milestone_select.js.coffee
app/assets/javascripts/milestone_select.js.coffee
+12
-10
app/controllers/projects/milestones_controller.rb
app/controllers/projects/milestones_controller.rb
+1
-1
app/finders/issuable_finder.rb
app/finders/issuable_finder.rb
+1
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+14
-0
app/models/global_milestone.rb
app/models/global_milestone.rb
+2
-1
app/views/shared/issuable/_milestone_dropdown.html.haml
app/views/shared/issuable/_milestone_dropdown.html.haml
+1
-1
未找到文件。
app/assets/javascripts/milestone_select.js.coffee
浏览文件 @
88024b17
...
...
@@ -50,19 +50,22 @@ class @MilestoneSelect
extraOptions
=
[]
if
showAny
extraOptions
.
push
(
isAny
:
true
id
:
0
name
:
''
title
:
'Any Milestone'
)
if
showNo
extraOptions
.
push
(
id
:
'0'
id
:
-
1
name
:
'No Milestone'
title
:
'No Milestone'
)
if
showUpcoming
extraOptions
.
push
(
id
:
'#upcoming'
id
:
-
2
name
:
'#upcoming'
title
:
'Upcoming'
)
>>>>>>>
Updated
to
only
include
upcoming
on
filters
...
...
@@ -84,14 +87,11 @@ class @MilestoneSelect
milestone
.
title
id
:
(
milestone
)
->
if
!
useId
if
!
milestone
.
isAny
?
milestone
.
title
else
''
milestone
.
name
else
milestone
.
id
isSelected
:
(
milestone
)
->
milestone
.
titl
e
is
selectedMilestone
milestone
.
nam
e
is
selectedMilestone
hidden
:
->
$selectbox
.
hide
()
$value
.
show
()
...
...
@@ -99,8 +99,10 @@ class @MilestoneSelect
if
$dropdown
.
hasClass
'js-filter-bulk-update'
return
if
$dropdown
.
hasClass
'js-filter-submit'
if
selected
.
title
?
if
$dropdown
.
hasClass
(
'js-filter-submit'
)
and
(
isIssueIndex
or
isMRIndex
)
if
selected
.
name
?
selectedMilestone
=
selected
.
name
else
if
selected
.
title
?
selectedMilestone
=
selected
.
title
$dropdown
.
parents
(
'form'
).
submit
()
else
...
...
app/controllers/projects/milestones_controller.rb
浏览文件 @
88024b17
...
...
@@ -24,7 +24,7 @@ class Projects::MilestonesController < Projects::ApplicationController
@milestones
=
@milestones
.
page
(
params
[
:page
])
end
format
.
json
do
render
json:
@milestones
render
json:
@milestones
.
to_json
(
methods: :name
)
end
end
end
...
...
app/finders/issuable_finder.rb
浏览文件 @
88024b17
...
...
@@ -243,7 +243,7 @@ class IssuableFinder
end
def
filter_by_upcoming_milestone?
params
[
:milestone_title
]
==
'Upcoming'
params
[
:milestone_title
]
==
Milestone
::
Upcoming
.
name
end
def
by_milestone
(
items
)
...
...
app/helpers/issuables_helper.rb
浏览文件 @
88024b17
...
...
@@ -47,6 +47,20 @@ module IssuablesHelper
end
end
def
milestone_dropdown_label
(
milestone_title
,
default_label
)
milestone_title
=
if
milestone_title
==
Milestone
::
Upcoming
.
name
Milestone
::
Upcoming
.
title
else
milestone_title
end
if
!
milestone_title
.
nil?
&&
!
milestone_title
.
empty?
h
(
milestone_title
)
else
default_label
end
end
private
def
sidebar_gutter_collapsed?
...
...
app/models/global_milestone.rb
浏览文件 @
88024b17
...
...
@@ -8,12 +8,13 @@ class GlobalMilestone
milestones
=
milestones
.
group_by
(
&
:title
)
milestones
.
map
do
|
title
,
milestones
|
new
(
title
,
milestones
)
new
(
title
,
milestones
)
end
end
def
initialize
(
title
,
milestones
)
@title
=
title
@name
=
title
@milestones
=
milestones
end
...
...
app/views/shared/issuable/_milestone_dropdown.html.haml
浏览文件 @
88024b17
-
if
params
[
:milestone_title
]
=
hidden_field_tag
(
:milestone_title
,
params
[
:milestone_title
])
=
dropdown_tag
(
h
(
params
[
:milestone_title
].
presence
||
"Milestone"
),
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
],
"Milestone"
),
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录