Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d8ebcb74
Commit
d8ebcb74
authored
Aug 02, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Fix toggle discussion
parent
91481002
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+4
-7
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+1
-1
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+1
-0
No files found.
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
d8ebcb74
<
script
>
/* global Flash */
import
{
mapActions
,
mapMutations
}
from
'
vuex
'
;
import
{
TOGGLE_DISCUSSION
}
from
'
../stores/mutation_types
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
issueNote
from
'
./issue_note.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
...
...
@@ -51,10 +50,8 @@
methods
:
{
...
mapActions
([
'
saveNote
'
,
'
toggleDiscussion
'
]),
...
mapMutations
({
toggleDiscussion
:
TOGGLE_DISCUSSION
,
}),
componentName
(
note
)
{
if
(
note
.
isPlaceholderNote
)
{
if
(
note
.
placeholderType
===
SYSTEM_NOTE
)
{
...
...
@@ -68,7 +65,7 @@
componentData
(
note
)
{
return
note
.
isPlaceholderNote
?
note
.
notes
[
0
]
:
note
;
},
toggleDiscussion
()
{
toggleDiscussion
Handler
()
{
this
.
toggleDiscussion
({
discussionId
:
this
.
note
.
id
});
},
showReplyForm
()
{
...
...
@@ -128,7 +125,7 @@
:created-at=
"discussion.created_at"
:note-id=
"discussion.id"
:include-toggle=
"true"
:toggle-handler=
"toggleDiscussion"
:toggle-handler=
"toggleDiscussion
Handler
"
action-text=
"started a discussion"
/>
<issue-note-edited-text
...
...
app/assets/javascripts/notes/components/issue_note.vue
View file @
d8ebcb74
...
...
@@ -82,7 +82,7 @@
full_data
:
true
,
target_type
:
'
issue
'
,
target_id
:
this
.
note
.
noteable_id
,
note
,
note
:
{
note
:
note
}
,
},
};
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
d8ebcb74
...
...
@@ -14,6 +14,7 @@ export const setUserData = ({ commit }, data) => commit(types.SET_USER_DATA, dat
export
const
setLastFetchedAt
=
({
commit
},
data
)
=>
commit
(
types
.
SET_LAST_FETCHED_AT
,
data
);
export
const
setInitialNotes
=
({
commit
},
data
)
=>
commit
(
types
.
SET_INITAL_NOTES
,
data
);
export
const
setTargetNoteHash
=
({
commit
},
data
)
=>
commit
(
types
.
SET_TARGET_NOTE_HASH
,
data
);
export
const
toggleDiscussion
=
({
commit
},
data
)
=>
commit
(
types
.
TOGGLE_DISCUSSION
,
data
);
export
const
fetchNotes
=
({
commit
},
path
)
=>
service
.
fetchNotes
(
path
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment