Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
998299e2
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,发现更多精彩内容 >>
提交
998299e2
编写于
6月 22, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
IssueNotesRefactor: Implement note edit.
上级
092d4ca6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
3 deletion
+47
-3
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+17
-2
app/assets/javascripts/notes/components/issue_note_body.vue
app/assets/javascripts/notes/components/issue_note_body.vue
+7
-1
app/assets/javascripts/notes/services/issue_notes_service.js
app/assets/javascripts/notes/services/issue_notes_service.js
+3
-0
app/assets/javascripts/notes/stores/issue_notes_store.js
app/assets/javascripts/notes/stores/issue_notes_store.js
+20
-0
未找到文件。
app/assets/javascripts/notes/components/issue_note.vue
浏览文件 @
998299e2
...
@@ -57,8 +57,23 @@ export default {
...
@@ -57,8 +57,23 @@ export default {
});
});
}
}
},
},
formUpdateHandler
()
{
formUpdateHandler
(
note
)
{
// console.log('update requested', data);
const
data
=
{
endpoint
:
`
${
this
.
note
.
path
}
?full_data=1`
,
note
:
{
target_type
:
'
issue
'
,
target_id
:
this
.
note
.
noteable_id
,
note
,
},
};
this
.
$store
.
dispatch
(
'
updateNote
'
,
data
)
.
then
(()
=>
{
this
.
isEditing
=
false
;
})
.
catch
(()
=>
{
new
Flash
(
'
Something went wrong while editing your comment. Please try again.
'
);
// eslint-disable-line
});
},
},
formCancelHandler
()
{
formCancelHandler
()
{
this
.
isEditing
=
false
;
this
.
isEditing
=
false
;
...
...
app/assets/javascripts/notes/components/issue_note_body.vue
浏览文件 @
998299e2
...
@@ -32,6 +32,11 @@ export default {
...
@@ -32,6 +32,11 @@ export default {
renderGFM
()
{
renderGFM
()
{
$
(
this
.
$refs
[
'
note-body
'
]).
renderGFM
();
$
(
this
.
$refs
[
'
note-body
'
]).
renderGFM
();
},
},
handleFormUpdate
()
{
this
.
formUpdateHandler
({
note
:
this
.
$refs
.
noteForm
.
note
,
});
},
},
},
mounted
()
{
mounted
()
{
this
.
renderGFM
();
this
.
renderGFM
();
...
@@ -48,7 +53,8 @@ export default {
...
@@ -48,7 +53,8 @@ export default {
class=
"note-text md"
></div>
class=
"note-text md"
></div>
<issue-note-form
<issue-note-form
v-if=
"isEditing"
v-if=
"isEditing"
:updateHandler=
"formUpdateHandler"
ref=
"noteForm"
:updateHandler=
"handleFormUpdate"
:cancelHandler=
"formCancelHandler"
:cancelHandler=
"formCancelHandler"
:noteBody=
"note.note"
/>
:noteBody=
"note.note"
/>
<issue-note-edited-text
<issue-note-edited-text
...
...
app/assets/javascripts/notes/services/issue_notes_service.js
浏览文件 @
998299e2
...
@@ -13,4 +13,7 @@ export default {
...
@@ -13,4 +13,7 @@ export default {
replyToDiscussion
(
endpoint
,
data
)
{
replyToDiscussion
(
endpoint
,
data
)
{
return
Vue
.
http
.
post
(
endpoint
,
data
,
{
emulateJSON
:
true
});
return
Vue
.
http
.
post
(
endpoint
,
data
,
{
emulateJSON
:
true
});
},
},
updateNote
(
endpoint
,
data
)
{
return
Vue
.
http
.
put
(
endpoint
,
data
,
{
emulateJSON
:
true
});
},
};
};
app/assets/javascripts/notes/stores/issue_notes_store.js
浏览文件 @
998299e2
...
@@ -42,6 +42,16 @@ const mutations = {
...
@@ -42,6 +42,16 @@ const mutations = {
noteObj
.
notes
.
push
(
note
);
noteObj
.
notes
.
push
(
note
);
},
},
updateNote
(
storeState
,
note
)
{
const
noteObj
=
findNoteObjectById
(
storeState
.
notes
,
note
.
discussion_id
);
if
(
noteObj
.
individual_note
)
{
noteObj
.
notes
.
splice
(
0
,
1
,
note
);
}
else
{
const
comment
=
findNoteObjectById
(
noteObj
.
notes
,
note
.
id
);
noteObj
.
notes
.
splice
(
noteObj
.
notes
.
indexOf
(
comment
),
1
,
note
);
}
},
};
};
const
actions
=
{
const
actions
=
{
...
@@ -70,6 +80,16 @@ const actions = {
...
@@ -70,6 +80,16 @@ const actions = {
context
.
commit
(
'
addNewReplyToDiscussion
'
,
res
);
context
.
commit
(
'
addNewReplyToDiscussion
'
,
res
);
});
});
},
},
updateNote
(
context
,
data
)
{
const
{
endpoint
,
note
}
=
data
;
return
service
.
updateNote
(
endpoint
,
note
)
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
context
.
commit
(
'
updateNote
'
,
res
);
});
},
};
};
export
default
{
export
default
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录