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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
ef443a99
Commit
ef443a99
authored
Apr 12, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ResolveBtn when CommentStore changes state
parent
d7a52716
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/diff_notes/components/resolve_btn.js
app/assets/javascripts/diff_notes/components/resolve_btn.js
+4
-4
No files found.
app/assets/javascripts/diff_notes/components/resolve_btn.js
View file @
ef443a99
...
@@ -20,8 +20,7 @@ import Vue from 'vue';
...
@@ -20,8 +20,7 @@ import Vue from 'vue';
data
:
function
()
{
data
:
function
()
{
return
{
return
{
discussions
:
CommentsStore
.
state
,
discussions
:
CommentsStore
.
state
,
loading
:
false
,
loading
:
false
note
:
{},
};
};
},
},
watch
:
{
watch
:
{
...
@@ -34,6 +33,9 @@ import Vue from 'vue';
...
@@ -34,6 +33,9 @@ import Vue from 'vue';
discussion
:
function
()
{
discussion
:
function
()
{
return
this
.
discussions
[
this
.
discussionId
];
return
this
.
discussions
[
this
.
discussionId
];
},
},
note
:
function
()
{
return
this
.
discussion
?
this
.
discussion
.
getNote
(
this
.
noteId
)
:
{};
},
buttonText
:
function
()
{
buttonText
:
function
()
{
if
(
this
.
isResolved
)
{
if
(
this
.
isResolved
)
{
return
`Resolved by
${
this
.
resolvedByName
}
`
;
return
`Resolved by
${
this
.
resolvedByName
}
`
;
...
@@ -112,8 +114,6 @@ import Vue from 'vue';
...
@@ -112,8 +114,6 @@ import Vue from 'vue';
authorAvatar
:
this
.
authorAvatar
,
authorAvatar
:
this
.
authorAvatar
,
noteTruncated
:
this
.
noteTruncated
,
noteTruncated
:
this
.
noteTruncated
,
});
});
this
.
note
=
this
.
discussion
.
getNote
(
this
.
noteId
);
}
}
});
});
...
...
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