Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
19da7a55
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,发现更多精彩内容 >>
提交
19da7a55
编写于
8月 24, 2017
作者:
J
Jarka Kadlecova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix failure when issue author is nil
上级
610155e0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
12 deletion
+35
-12
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-1
app/views/shared/issuable/_close_reopen_button.html.haml
app/views/shared/issuable/_close_reopen_button.html.haml
+2
-1
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
...ews/shared/issuable/_close_reopen_report_toggle.html.haml
+12
-10
changelogs/unreleased/36860-deleted-user-fix.yml
changelogs/unreleased/36860-deleted-user-fix.yml
+5
-0
spec/features/issues/issue_detail_spec.rb
spec/features/issues/issue_detail_spec.rb
+14
-0
未找到文件。
app/views/projects/issues/show.html.haml
浏览文件 @
19da7a55
...
...
@@ -32,7 +32,8 @@
%ul
-
if
can_update_issue
%li
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
)
-
unless
current_user
==
@issue
.
author
/ TODO: simplify condition back #36860
-
if
@issue
.
author
&&
current_user
!=
@issue
.
author
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
-
if
can_update_issue
%li
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
format:
'json'
),
class:
"btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
...
...
app/views/shared/issuable/_close_reopen_button.html.haml
浏览文件 @
19da7a55
...
...
@@ -9,6 +9,7 @@
class:
"hidden-xs hidden-sm btn btn-grouped btn-reopen
#{
issuable_button_visibility
(
issuable
,
false
)
}
"
,
title:
"Reopen
#{
display_issuable_type
}
"
-
elsif
can_update
&&
!
is_current_user
=
render
'shared/issuable/close_reopen_report_toggle'
,
issuable:
issuable
-
else
-
elsif
issuable
.
author
/ TODO: change back to else #36860
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
class:
'hidden-xs hidden-sm btn btn-grouped btn-close-color'
,
title:
'Report abuse'
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
浏览文件 @
19da7a55
...
...
@@ -37,13 +37,15 @@
%li
.divider.droplab-item-ignore
%li
.report-item
{
data:
{
text:
'Report abuse'
,
url:
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
button_class:
"#{button_class} btn-close-color"
,
toggle_class:
"#{toggle_class} btn-close-color"
,
method:
''
}
}
%button
.btn.btn-transparent
=
icon
(
'check'
,
class:
'icon'
)
.description
%strong
.title
Report abuse
%p
.text
Report
=
display_issuable_type
.
pluralize
that are abusive, inappropriate or spam.
/ TODO: remove condition #36860
-
if
issuable
.
author
%li
.report-item
{
data:
{
text:
'Report abuse'
,
url:
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
button_class:
"#{button_class} btn-close-color"
,
toggle_class:
"#{toggle_class} btn-close-color"
,
method:
''
}
}
%button
.btn.btn-transparent
=
icon
(
'check'
,
class:
'icon'
)
.description
%strong
.title
Report abuse
%p
.text
Report
=
display_issuable_type
.
pluralize
that are abusive, inappropriate or spam.
changelogs/unreleased/36860-deleted-user-fix.yml
0 → 100644
浏览文件 @
19da7a55
---
title
:
Fix failure when issue is authored by a deleted user
merge_request
:
13807
author
:
type
:
fixed
spec/features/issues/issue_detail_spec.rb
浏览文件 @
19da7a55
...
...
@@ -40,4 +40,18 @@ feature 'Issue Detail', :js do
end
end
end
context
'when authored by a user who is later deleted'
do
before
do
issue
.
update_attribute
(
:author_id
,
nil
)
sign_in
(
user
)
visit
project_issue_path
(
project
,
issue
)
end
it
'shows the issue'
do
page
.
within
(
'.issuable-details'
)
do
expect
(
find
(
'h2'
)).
to
have_content
(
issue
.
title
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录