Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
12cc9a53
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,发现更多精彩内容 >>
提交
12cc9a53
编写于
1月 30, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed date check test
上级
5942247d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
29 addition
and
31 deletion
+29
-31
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+1
-1
app/assets/javascripts/due_date_select.js.es6
app/assets/javascripts/due_date_select.js.es6
+2
-5
app/assets/javascripts/issuable_form.js
app/assets/javascripts/issuable_form.js
+1
-2
app/assets/javascripts/member_expiration_date.js.es6
app/assets/javascripts/member_expiration_date.js.es6
+1
-3
app/views/profiles/personal_access_tokens/index.html.haml
app/views/profiles/personal_access_tokens/index.html.haml
+1
-1
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
...s/members/master_adds_member_with_expiration_date_spec.rb
+23
-19
未找到文件。
app/assets/javascripts/application.js
浏览文件 @
12cc9a53
...
...
@@ -34,7 +34,7 @@ require('bootstrap/js/transition');
require
(
'
bootstrap/js/tooltip
'
);
require
(
'
bootstrap/js/popover
'
);
require
(
'
select2/select2.js
'
);
require
(
'
pikaday
'
);
window
.
Pikaday
=
require
(
'
pikaday
'
);
window
.
_
=
require
(
'
underscore
'
);
window
.
Dropzone
=
require
(
'
dropzone
'
);
require
(
'
mousetrap
'
);
...
...
app/assets/javascripts/due_date_select.js.es6
浏览文件 @
12cc9a53
...
...
@@ -48,7 +48,7 @@
const calendar = new Pikaday({
field: $dueDateInput.get(0),
theme: 'gitlab-theme',
format: '
yyyy-mm-dd
',
format: '
YYYY-MM-DD
',
onSelect: (dateText) => {
const formattedDate = dateFormat(new Date(dateText), 'yyyy-mm-dd');
...
...
@@ -63,8 +63,6 @@
}
});
calendar.setDate(new Date($dueDateInput.val()));
this.$datePicker.append(calendar.el);
this.$datePicker.data('pikaday', calendar);
}
...
...
@@ -171,12 +169,11 @@
const calendar = new Pikaday({
field: $datePicker.get(0),
theme: 'gitlab-theme',
format: '
yyyy-mm-dd
',
format: '
YYYY-MM-DD
',
onSelect(dateText) {
$datePicker.val(dateFormat(new Date(dateText), 'yyyy-mm-dd'));
}
});
calendar.setDate(new Date($datePicker.val()));
$datePicker.data('pikaday', calendar);
});
...
...
app/assets/javascripts/issuable_form.js
浏览文件 @
12cc9a53
...
...
@@ -40,12 +40,11 @@
calendar
=
new
Pikaday
({
field
:
$issuableDueDate
.
get
(
0
),
theme
:
'
gitlab-theme
'
,
format
:
'
yyyy-mm-dd
'
,
format
:
'
YYYY-MM-DD
'
,
onSelect
:
function
(
dateText
)
{
$issuableDueDate
.
val
(
dateFormat
(
new
Date
(
dateText
),
'
yyyy-mm-dd
'
));
}
});
calendar
.
setDate
(
new
Date
(
$issuableDueDate
.
val
()));
}
}
...
...
app/assets/javascripts/member_expiration_date.js.es6
浏览文件 @
12cc9a53
...
...
@@ -19,7 +19,7 @@
const calendar = new Pikaday({
field: $input.get(0),
theme: 'gitlab-theme',
format: '
yyyy-mm-dd
',
format: '
YYYY-MM-DD
',
minDate: new Date(),
onSelect(dateText) {
$input.val(dateFormat(new Date(dateText), 'yyyy-mm-dd'));
...
...
@@ -30,8 +30,6 @@
},
});
calendar.setDate(new Date($input.val()));
$input.data('pikaday', calendar);
});
...
...
app/views/profiles/personal_access_tokens/index.html.haml
浏览文件 @
12cc9a53
...
...
@@ -91,7 +91,7 @@
new
Pikaday
({
field
:
$dateField
.
get
(
0
),
theme
:
'
gitlab-theme
'
,
format
:
'
yyyy-mm-dd
'
,
format
:
'
YYYY-MM-DD
'
,
minDate
:
new
Date
(),
onSelect
:
function
(
dateText
)
{
$dateField
.
val
(
dateFormat
(
new
Date
(
dateText
),
'
yyyy-mm-dd
'
));
...
...
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
浏览文件 @
12cc9a53
...
...
@@ -15,29 +15,33 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
end
scenario
'expiration date is displayed in the members list'
do
date
=
5
.
days
.
from_now
visit
namespace_project_project_members_path
(
project
.
namespace
,
project
)
page
.
within
'.users-project-form'
do
select2
(
new_member
.
id
,
from:
'#user_ids'
,
multiple:
true
)
fill_in
'expires_at'
,
with:
date
.
to_s
(
:medium
)
click_on
'Add to project'
end
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
expect
(
page
).
to
have_content
(
'Expires in 4 days'
)
travel_to
Time
.
zone
.
parse
(
'2016-08-06 08:00'
)
do
date
=
4
.
days
.
from_now
visit
namespace_project_project_members_path
(
project
.
namespace
,
project
)
page
.
within
'.users-project-form'
do
select2
(
new_member
.
id
,
from:
'#user_ids'
,
multiple:
true
)
fill_in
'expires_at'
,
with:
date
.
to_s
(
:medium
)
click_on
'Add to project'
end
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
expect
(
page
).
to
have_content
(
'Expires in 4 days'
)
end
end
end
scenario
'change expiration date'
do
date
=
4
.
days
.
from_now
project
.
team
.
add_users
([
new_member
.
id
],
:developer
,
expires_at:
Date
.
today
.
to_s
(
:medium
))
visit
namespace_project_project_members_path
(
project
.
namespace
,
project
)
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
find
(
'.js-access-expiration-date'
).
set
date
.
to_s
(
:medium
)
wait_for_ajax
expect
(
page
).
to
have_content
(
'Expires in 3 days'
)
travel_to
Time
.
zone
.
parse
(
'2016-08-06 08:00'
)
do
date
=
3
.
days
.
from_now
project
.
team
.
add_users
([
new_member
.
id
],
:developer
,
expires_at:
Date
.
today
.
to_s
(
:medium
))
visit
namespace_project_project_members_path
(
project
.
namespace
,
project
)
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
find
(
'.js-access-expiration-date'
).
set
date
.
to_s
(
:medium
)
wait_for_ajax
expect
(
page
).
to
have_content
(
'Expires in 3 days'
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录