Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a7567ca1
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 搜索 >>
提交
a7567ca1
编写于
1月 23, 2016
作者:
O
Oliver Rogers
提交者:
Rémy Coutable
2月 10, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix milestone order in project and issue edit lists to due_date
上级
fd1a68d4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
12 deletion
+10
-12
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/milestones_controller.rb
app/controllers/projects/milestones_controller.rb
+6
-5
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+3
-3
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+0
-4
未找到文件。
CHANGELOG
浏览文件 @
a7567ca1
...
...
@@ -51,6 +51,7 @@ v 8.4.4
- Update omniauth-saml gem to 1.4.2
- Prevent long-running backup tasks from timing out the database connection
- Add a Project setting to allow guests to view build logs (defaults to true)
- Sort project milestones by due date including issue editor (Oliver Rogers / Orih)
v 8.4.3
- Increase lfs_objects size column to 8-byte integer to allow files larger
...
...
app/controllers/projects/milestones_controller.rb
浏览文件 @
a7567ca1
...
...
@@ -11,11 +11,12 @@ class Projects::MilestonesController < Projects::ApplicationController
respond_to
:html
def
index
@milestones
=
case
params
[
:state
]
when
'all'
;
@project
.
milestones
.
order
(
"state, due_date DESC"
)
when
'closed'
;
@project
.
milestones
.
closed
.
order
(
"due_date DESC"
)
else
@project
.
milestones
.
active
.
order
(
"due_date ASC"
)
end
@milestones
=
case
params
[
:state
]
when
'all'
then
@project
.
milestones
.
reorder
(
due_date: :desc
,
title: :asc
)
when
'closed'
then
@project
.
milestones
.
closed
.
reorder
(
due_date: :desc
,
title: :asc
)
else
@project
.
milestones
.
active
.
reorder
(
due_date: :asc
,
title: :asc
)
end
@milestones
=
@milestones
.
includes
(
:project
)
@milestones
=
@milestones
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
...
...
app/helpers/issues_helper.rb
浏览文件 @
a7567ca1
...
...
@@ -44,14 +44,14 @@ module IssuesHelper
end
def
bulk_update_milestone_options
milestones
=
project_active_milestones
.
to_a
milestones
=
@project
.
milestones
.
active
.
reorder
(
due_date: :asc
,
title: :asc
)
.
to_a
milestones
.
unshift
(
Milestone
::
None
)
options_from_collection_for_select
(
milestones
,
'id'
,
'title'
,
params
[
:milestone_id
])
end
def
milestone_options
(
object
)
milestones
=
object
.
project
.
milestones
.
active
.
to_a
milestones
=
object
.
project
.
milestones
.
active
.
reorder
(
due_date: :asc
,
title: :asc
).
to_a
milestones
.
unshift
(
Milestone
::
None
)
options_from_collection_for_select
(
milestones
,
'id'
,
'title'
,
object
.
milestone_id
)
...
...
@@ -69,7 +69,7 @@ module IssuesHelper
end
end
def
issue_button_visibility
(
issue
,
closed
)
def
issue_button_visibility
(
issue
,
closed
)
return
'hidden'
if
issue
.
closed?
==
closed
end
...
...
app/helpers/projects_helper.rb
浏览文件 @
a7567ca1
...
...
@@ -98,10 +98,6 @@ module ProjectsHelper
project_nav_tabs
.
include?
name
end
def
project_active_milestones
@project
.
milestones
.
active
.
order
(
"due_date, title ASC"
)
end
def
project_for_deploy_key
(
deploy_key
)
if
deploy_key
.
projects
.
include?
(
@project
)
@project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录