Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c4fea61f
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,发现更多精彩内容 >>
提交
c4fea61f
编写于
5月 15, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added inline confidential field
[ci skip]
上级
36df19e7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
46 addition
and
1 deletion
+46
-1
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+17
-1
app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue
...ts/issue_show/components/fields/confidential_checkbox.vue
+23
-0
app/assets/javascripts/issue_show/index.js
app/assets/javascripts/issue_show/index.js
+3
-0
app/assets/javascripts/issue_show/stores/index.js
app/assets/javascripts/issue_show/stores/index.js
+1
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-0
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+1
-0
未找到文件。
app/assets/javascripts/issue_show/components/app.vue
浏览文件 @
c4fea61f
...
...
@@ -7,6 +7,7 @@ import Service from '../services/index';
import
Store
from
'
../stores
'
;
import
titleComponent
from
'
./title.vue
'
;
import
descriptionComponent
from
'
./description.vue
'
;
import
confidentialCheckbox
from
'
./fields/confidential_checkbox.vue
'
;
import
editActions
from
'
./edit_actions.vue
'
;
export
default
{
...
...
@@ -41,6 +42,10 @@ export default {
required
:
false
,
default
:
''
,
},
isConfidential
:
{
type
:
Boolean
,
required
:
true
,
},
},
data
()
{
const
store
=
new
Store
({
...
...
@@ -67,12 +72,14 @@ export default {
descriptionComponent
,
titleComponent
,
editActions
,
confidentialCheckbox
,
},
methods
:
{
openForm
()
{
this
.
showForm
=
true
;
this
.
store
.
formState
=
{
title
:
this
.
state
.
titleText
,
confidential
:
this
.
isConfidential
,
};
},
closeForm
()
{
...
...
@@ -80,7 +87,13 @@ export default {
},
updateIssuable
()
{
this
.
service
.
updateIssuable
(
this
.
store
.
formState
)
.
then
(()
=>
{
.
then
((
res
)
=>
{
const
data
=
res
.
json
();
if
(
data
.
confidential
!==
this
.
isConfidential
)
{
location
.
reload
();
}
eventHub
.
$emit
(
'
close.form
'
);
})
.
catch
(()
=>
{
...
...
@@ -157,6 +170,9 @@ export default {
:description-text=
"state.descriptionText"
:updated-at=
"state.updatedAt"
:task-status=
"state.taskStatus"
/>
<confidential-checkbox
v-if=
"showForm"
:form-state=
"formState"
/>
<edit-actions
v-if=
"canUpdate && showForm"
:can-destroy=
"canDestroy"
/>
...
...
app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue
0 → 100644
浏览文件 @
c4fea61f
<
script
>
export
default
{
props
:
{
formState
:
{
type
:
Object
,
required
:
true
,
},
},
};
</
script
>
<
template
>
<fieldset
class=
"checkbox"
>
<label
for=
"issue_confidential"
>
<input
type=
"checkbox"
value=
"1"
id=
"issue_confidential"
v-model=
"formState.confidential"
/>
This issue is confidential and should only be visible to team members with at least Reporter access.
</label>
</fieldset>
</
template
>
app/assets/javascripts/issue_show/index.js
浏览文件 @
c4fea61f
...
...
@@ -25,6 +25,7 @@ document.addEventListener('DOMContentLoaded', () => {
canDestroy
,
endpoint
,
issuableRef
,
isConfidential
,
}
=
issuableElement
.
dataset
;
return
{
...
...
@@ -35,6 +36,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialTitle
:
issuableTitleElement
.
innerHTML
,
initialDescriptionHtml
:
issuableDescriptionElement
?
issuableDescriptionElement
.
innerHTML
:
''
,
initialDescriptionText
:
issuableDescriptionTextarea
?
issuableDescriptionTextarea
.
textContent
:
''
,
isConfidential
:
gl
.
utils
.
convertPermissionToBoolean
(
isConfidential
),
};
},
render
(
createElement
)
{
...
...
@@ -47,6 +49,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialTitle
:
this
.
initialTitle
,
initialDescriptionHtml
:
this
.
initialDescriptionHtml
,
initialDescriptionText
:
this
.
initialDescriptionText
,
isConfidential
:
this
.
isConfidential
,
},
});
},
...
...
app/assets/javascripts/issue_show/stores/index.js
浏览文件 @
c4fea61f
...
...
@@ -14,6 +14,7 @@ export default class Store {
};
this
.
formState
=
{
title
:
''
,
confidential
:
false
,
};
}
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
c4fea61f
...
...
@@ -55,6 +55,7 @@
"can-update"
=>
can?
(
current_user
,
:update_issue
,
@issue
).
to_s
,
"can-destroy"
=>
can?
(
current_user
,
:destroy_issue
,
@issue
).
to_s
,
"issuable-ref"
=>
@issue
.
to_reference
,
"is-confidential"
=>
@issue
.
confidential
.
to_s
,
}
}
%h2
.title
=
markdown_field
(
@issue
,
:title
)
-
if
@issue
.
description
.
present?
...
...
spec/javascripts/issue_show/components/app_spec.js
浏览文件 @
c4fea61f
...
...
@@ -35,6 +35,7 @@ describe('Issuable output', () => {
initialDescriptionHtml
:
''
,
initialDescriptionText
:
''
,
showForm
:
false
,
isConfidential
:
false
,
},
}).
$mount
();
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录