Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b61e1e7a
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,发现更多精彩内容 >>
提交
b61e1e7a
编写于
6月 06, 2018
作者:
S
Stan Hu
提交者:
Clement Ho
6月 06, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix invisible rows on importer status
上级
53457cb0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
9 deletion
+9
-9
app/assets/javascripts/importer_status.js
app/assets/javascripts/importer_status.js
+2
-2
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+3
-3
spec/helpers/projects_helper_spec.rb
spec/helpers/projects_helper_spec.rb
+3
-3
spec/javascripts/importer_status_spec.js
spec/javascripts/importer_status_spec.js
+1
-1
未找到文件。
app/assets/javascripts/importer_status.js
浏览文件 @
b61e1e7a
...
...
@@ -58,7 +58,7 @@ class ImporterStatus {
job
.
find
(
'
.import-target
'
).
html
(
`<a href="
${
data
.
full_path
}
">
${
data
.
full_path
}
</a>`
);
$
(
'
table.import-jobs tbody
'
).
prepend
(
job
);
job
.
addClass
(
'
active
'
);
job
.
addClass
(
'
table-
active
'
);
const
connectingVerb
=
this
.
ciCdOnly
?
__
(
'
connecting
'
)
:
__
(
'
importing
'
);
job
.
find
(
'
.import-actions
'
).
html
(
sprintf
(
_
.
escape
(
__
(
'
%{loadingIcon} Started
'
)),
{
...
...
@@ -81,7 +81,7 @@ class ImporterStatus {
switch
(
job
.
import_status
)
{
case
'
finished
'
:
jobItem
.
removeClass
(
'
active
'
).
addClass
(
'
success
'
);
jobItem
.
removeClass
(
'
table-active
'
).
addClass
(
'
table-
success
'
);
statusField
.
html
(
`<span><i class="fa fa-check"></i>
${
__
(
'
Done
'
)}
</span>`
);
break
;
case
'
scheduled
'
:
...
...
app/helpers/projects_helper.rb
浏览文件 @
b61e1e7a
...
...
@@ -389,11 +389,11 @@ module ProjectsHelper
def
project_status_css_class
(
status
)
case
status
when
"started"
"active"
"
table-
active"
when
"failed"
"danger"
"
table-
danger"
when
"finished"
"success"
"
table-
success"
end
end
...
...
spec/helpers/projects_helper_spec.rb
浏览文件 @
b61e1e7a
...
...
@@ -5,9 +5,9 @@ describe ProjectsHelper do
describe
"#project_status_css_class"
do
it
"returns appropriate class"
do
expect
(
project_status_css_class
(
"started"
)).
to
eq
(
"active"
)
expect
(
project_status_css_class
(
"failed"
)).
to
eq
(
"danger"
)
expect
(
project_status_css_class
(
"finished"
)).
to
eq
(
"success"
)
expect
(
project_status_css_class
(
"started"
)).
to
eq
(
"
table-
active"
)
expect
(
project_status_css_class
(
"failed"
)).
to
eq
(
"
table-
danger"
)
expect
(
project_status_css_class
(
"finished"
)).
to
eq
(
"
table-
success"
)
end
end
...
...
spec/javascripts/importer_status_spec.js
浏览文件 @
b61e1e7a
...
...
@@ -45,7 +45,7 @@ describe('Importer Status', () => {
currentTarget
:
document
.
querySelector
(
'
.js-add-to-import
'
),
})
.
then
(()
=>
{
expect
(
document
.
querySelector
(
'
tr
'
).
classList
.
contains
(
'
active
'
)).
toEqual
(
true
);
expect
(
document
.
querySelector
(
'
tr
'
).
classList
.
contains
(
'
table-
active
'
)).
toEqual
(
true
);
done
();
})
.
catch
(
done
.
fail
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录