Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7433377a
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,发现更多精彩内容 >>
提交
7433377a
编写于
6月 15, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
IssueNotesRefactor: Restrict
👍
and
👎
on your own note.
上级
36f84ce7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
16 deletion
+36
-16
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+3
-3
app/assets/javascripts/notes/components/issue_note_awards_list.vue
...s/javascripts/notes/components/issue_note_awards_list.vue
+29
-10
app/assets/javascripts/notes/components/issue_note_body.vue
app/assets/javascripts/notes/components/issue_note_body.vue
+3
-2
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+1
-1
未找到文件。
app/assets/javascripts/notes/components/issue_note.vue
浏览文件 @
7433377a
...
...
@@ -14,7 +14,7 @@ export default {
data
()
{
return
{
isEditing
:
false
,
}
}
;
},
components
:
{
UserAvatarLink
,
...
...
@@ -31,8 +31,8 @@ export default {
editHandler
()
{
this
.
isEditing
=
true
;
},
formUpdateHandler
(
data
)
{
console
.
log
(
'
update requested
'
,
data
);
formUpdateHandler
()
{
//
console.log('update requested', data);
},
formCancelHandler
()
{
this
.
isEditing
=
false
;
...
...
app/assets/javascripts/notes/components/issue_note_awards_list.vue
浏览文件 @
7433377a
...
...
@@ -10,13 +10,20 @@ export default {
type
:
Array
,
required
:
true
,
},
noteAuthorId
:
{
type
:
Number
,
required
:
true
,
},
},
data
()
{
const
userId
=
window
.
gon
.
current_user_id
;
return
{
emojiSmiling
,
emojiSmile
,
emojiSmiley
,
canAward
:
!!
window
.
gon
.
current_user_id
,
canAward
:
!!
userId
,
myUserId
:
userId
,
};
},
computed
:
{
...
...
@@ -48,9 +55,11 @@ export default {
delete
awards
.
thumbsdown
;
}
for
(
let
key
in
awards
)
{
// Because for-in forbidden
const
keys
=
Object
.
keys
(
awards
);
keys
.
forEach
((
key
)
=>
{
orderedAwards
[
key
]
=
awards
[
key
];
};
}
)
;
return
orderedAwards
;
},
...
...
@@ -59,27 +68,37 @@ export default {
getAwardHTML
(
name
)
{
return
glEmojiTag
(
name
);
},
getAwardClassBindings
(
awardList
)
{
getAwardClassBindings
(
awardList
,
awardName
)
{
return
{
active
:
this
.
amIAwarded
(
awardList
),
disabled
:
!
this
.
can
Award
,
disabled
:
!
this
.
can
InteractWithEmoji
(
awardList
,
awardName
)
,
};
},
canInteractWithEmoji
(
awardList
,
awardName
)
{
let
isAllowed
=
true
;
const
restrictedEmojis
=
[
'
thumbsup
'
,
'
thumbsdown
'
];
const
{
myUserId
,
noteAuthorId
}
=
this
;
// Users can not add :+1: and :-1: to their notes
if
(
myUserId
===
noteAuthorId
&&
restrictedEmojis
.
indexOf
(
awardName
)
>
-
1
)
{
isAllowed
=
false
;
}
return
this
.
canAward
&&
isAllowed
;
},
amIAwarded
(
awardList
)
{
const
myUserId
=
window
.
gon
.
current_user_id
;
const
isAwarded
=
awardList
.
filter
(
award
=>
award
.
user
.
id
===
myUserId
);
const
isAwarded
=
awardList
.
filter
(
award
=>
award
.
user
.
id
===
this
.
myUserId
);
return
isAwarded
.
length
;
},
awardTitle
(
awardsList
)
{
const
amIAwarded
=
this
.
amIAwarded
(
awardsList
);
const
myUserId
=
window
.
gon
.
current_user_id
;
const
TOOLTIP_NAME_COUNT
=
amIAwarded
?
9
:
10
;
let
awardList
=
awardsList
;
// Filter myself from list if I am awarded.
if
(
amIAwarded
)
{
awardList
=
awardList
.
filter
(
award
=>
award
.
user
.
id
!==
myUserId
);
awardList
=
awardList
.
filter
(
award
=>
award
.
user
.
id
!==
this
.
myUserId
);
}
// Get only 9-10 usernames to show in tooltip text.
...
...
@@ -120,7 +139,7 @@ export default {
<button
v-for=
"(awardList, awardName) in groupedAwards"
class=
"btn award-control has-tooltip"
:class=
"getAwardClassBindings(awardList)"
:class=
"getAwardClassBindings(awardList
, awardName
)"
:title=
"awardTitle(awardList)"
data-placement=
"bottom"
type=
"button"
>
...
...
app/assets/javascripts/notes/components/issue_note_body.vue
浏览文件 @
7433377a
...
...
@@ -21,7 +21,7 @@ export default {
formCancelHandler
:
{
type
:
Function
,
required
:
true
,
}
}
,
},
components
:
{
IssueNoteEditedText
,
...
...
@@ -58,6 +58,7 @@ export default {
actionText=
"Edited"
/>
<issue-note-awards-list
v-if=
"note.award_emoji.length"
:awards=
"note.award_emoji"
/>
:awards=
"note.award_emoji"
:noteAuthorId=
"note.author.id"
/>
</div>
</
template
>
app/assets/javascripts/notes/components/issue_note_form.vue
浏览文件 @
7433377a
...
...
@@ -21,7 +21,7 @@ export default {
note
:
this
.
noteBody
,
markdownPreviewUrl
:
''
,
markdownDocsUrl
:
''
,
}
}
;
},
components
:
{
MarkdownField
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录