Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
容器镜像库
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
f546698d
提交
f546698d
编辑于
1 week ago
作者:
Annabel Dunstone Gray
浏览文件
操作
下载
补丁
差异文件
Make snippet list info focusable
Changelog: changed
上级
21acc0bc
No related branches found
No related tags found
加载中
变更
3
隐藏空白变更内容
行内
左右并排
显示
3 个更改的文件
app/helpers/snippets_helper.rb
+12
-3
12 个添加, 3 个删除
app/helpers/snippets_helper.rb
app/views/shared/snippets/_snippet.html.haml
+3
-4
3 个添加, 4 个删除
app/views/shared/snippets/_snippet.html.haml
spec/views/shared/snippets/_snippet.html.haml_spec.rb
+8
-8
8 个添加, 8 个删除
spec/views/shared/snippets/_snippet.html.haml_spec.rb
有
23 个添加
和
15 个删除
app/helpers/snippets_helper.rb
+
12
−
3
浏览文件 @
f546698d
...
...
@@ -76,10 +76,19 @@ def snippet_file_count(snippet)
tooltip
=
n_
(
'%d file'
,
'%d files'
,
file_count
)
%
file_count
tag
.
span
(
class:
'file_count'
,
title:
tooltip
,
data:
{
toggle:
'tooltip'
,
container:
'body'
})
do
concat
(
sprite_icon
(
'documents'
,
css_class:
'gl-align-middle'
))
render
Pajamas
::
ButtonComponent
.
new
(
category: :tertiary
,
size: :small
,
icon:
'documents'
,
button_options:
{
title:
tooltip
,
data:
{
toggle:
'tooltip'
,
container:
'body'
},
aria:
{
label:
tooltip
},
class:
"file_count gl-min-h-0 gl-min-w-0 !gl-bg-transparent !gl-p-0"
}
)
do
concat
(
' '
)
concat
(
file_count
)
concat
(
file_count
.
to_s
)
end
end
...
...
此差异已折叠。
点击以展开。
app/views/shared/snippets/_snippet.html.haml
+
3
−
4
浏览文件 @
f546698d
...
...
@@ -26,12 +26,11 @@
=
_
(
'created %{timeAgo} by %{author}'
).
html_safe
%
{
timeAgo:
created_at
,
author:
author
}
.sm:gl-flex.gl-flex-col.gl-items-end
{
data:
{
testid:
'snippet-file-count-content'
,
qa_snippet_files:
snippet
.
statistics
&
.
file_count
}
}
.gl-flex.gl-gap-
4
.gl-items-center
.gl-flex.gl-gap-
3
.gl-items-center
-
if
notes_count
>
0
%span
.has-tooltip
{
title:
_
(
'Comments'
)
}
=
sprite_icon
(
'comments'
)
=
render
Pajamas
::
ButtonComponent
.
new
(
category: :tertiary
,
size: :small
,
icon:
'comments'
,
button_options:
{
class:
'has-tooltip !gl-bg-transparent !gl-p-0'
,
title:
_
(
'Comments'
),
aria:
{
label:
_
(
'Comments'
)
}
})
do
=
notes_count
=
snippet_file_count
(
snippet
)
%span
.has-tooltip
{
title:
visibility_level_label
(
snippet
.
visibility_level
),
data:
{
testid:
'snippet-visibility-content'
,
qa_snippet_visibility:
visibility_level_label
(
snippet
.
visibility_level
)
}
}
=
render
Pajamas
::
ButtonComponent
.
new
(
category: :tertiary
,
size: :small
,
button_options:
{
class:
'has-tooltip !gl-bg-transparent !gl-p-0'
,
title:
_
(
visibility_level_label
(
snippet
.
visibility_level
)
),
aria:
{
label:
_
(
snippet
.
visibility_level
)
}
,
data:
{
testid:
'snippet-visibility-content'
,
qa_snippet_visibility:
visibility_level_label
(
snippet
.
visibility_level
)
}
}
)
do
=
visibility_level_icon
(
snippet
.
visibility_level
)
.gl-whitespace-nowrap.gl-text-sm.gl-text-subtle
=
_
(
'updated %{timeAgo}'
).
html_safe
%
{
timeAgo:
time_ago_with_tooltip
(
snippet
.
updated_at
,
placement:
'bottom'
)
}
此差异已折叠。
点击以展开。
spec/views/shared/snippets/_snippet.html.haml_spec.rb
+
8
−
8
浏览文件 @
f546698d
...
...
@@ -20,8 +20,8 @@
render
'shared/snippets/snippet'
,
snippet:
snippet
expect
(
rendered
).
to
have_selector
(
"
span
.file_count"
,
text:
'3'
)
expect
(
rendered
).
to
have_selector
(
"
span
.file_count[title=
\"
3 files
\"
]"
)
expect
(
rendered
).
to
have_selector
(
".file_count"
,
text:
'3'
)
expect
(
rendered
).
to
have_selector
(
".file_count[title=
\"
3 files
\"
]"
)
end
it
'renders correct file count and tooltip when file_count is 1'
do
...
...
@@ -29,8 +29,8 @@
render
'shared/snippets/snippet'
,
snippet:
snippet
expect
(
rendered
).
to
have_selector
(
"
span
.file_count"
,
text:
'1'
)
expect
(
rendered
).
to
have_selector
(
"
span
.file_count[title=
\"
1 file
\"
]"
)
expect
(
rendered
).
to
have_selector
(
".file_count"
,
text:
'1'
)
expect
(
rendered
).
to
have_selector
(
".file_count[title=
\"
1 file
\"
]"
)
end
it
'does not render file count when file count is 0'
do
...
...
@@ -38,7 +38,7 @@
render
'shared/snippets/snippet'
,
snippet:
snippet
expect
(
rendered
).
not_to
have_selector
(
'
span
.file_count'
)
expect
(
rendered
).
not_to
have_selector
(
'.file_count'
)
end
end
...
...
@@ -48,7 +48,7 @@
render
'shared/snippets/snippet'
,
snippet:
snippet
expect
(
rendered
).
not_to
have_selector
(
'
span
.file_count'
)
expect
(
rendered
).
not_to
have_selector
(
'.file_count'
)
end
end
...
...
@@ -63,7 +63,7 @@
end
it
'does not render tooltip'
do
expect
(
rendered
).
not_to
have_selector
(
"
span
.has-tooltip[title='This snippet is hidden because its author has been banned']"
)
expect
(
rendered
).
not_to
have_selector
(
".has-tooltip[title='This snippet is hidden because its author has been banned']"
)
end
end
...
...
@@ -80,7 +80,7 @@
end
it
'renders tooltip'
do
expect
(
rendered
).
to
have_selector
(
"
span
.has-tooltip[title='This snippet is hidden because its author has been banned']"
)
expect
(
rendered
).
to
have_selector
(
".has-tooltip[title='This snippet is hidden because its author has been banned']"
)
end
end
end
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录