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
Léo-Paul Géneau
gitlab-ce
Commits
adc73379
Commit
adc73379
authored
Aug 21, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: First comment and then close the issue.
parent
e0d583cb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+13
-8
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
adc73379
...
@@ -139,21 +139,26 @@
...
@@ -139,21 +139,26 @@
}
else
{
}
else
{
this
.
discard
();
this
.
discard
();
}
}
if
(
withIssueAction
)
{
this
.
toggleIssueState
();
}
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isSubmitting
=
false
;
this
.
isSubmitting
=
false
;
this
.
discard
(
false
);
this
.
discard
(
false
);
});
});
}
else
{
this
.
toggleIssueState
();
}
}
},
if
(
withIssueAction
)
{
toggleIssueState
(
)
{
this
.
issueState
=
this
.
isIssueOpen
?
constants
.
CLOSED
:
constants
.
REOPENED
;
this
.
issueState
=
this
.
isIssueOpen
?
constants
.
CLOSED
:
constants
.
REOPENED
;
// This is out of scope for the Notes Vue component.
// This is out of scope for the Notes Vue component.
// It was the shortest path to update the issue state and relevant places.
// It was the shortest path to update the issue state and relevant places.
const
btnClass
=
this
.
isIssueOpen
?
'
btn-reopen
'
:
'
btn-close
'
;
const
btnClass
=
this
.
isIssueOpen
?
'
btn-reopen
'
:
'
btn-close
'
;
$
(
`.js-btn-issue-action.
${
btnClass
}
:visible`
).
trigger
(
'
click
'
);
$
(
`.js-btn-issue-action.
${
btnClass
}
:visible`
).
trigger
(
'
click
'
);
}
},
},
discard
(
shouldClear
=
true
)
{
discard
(
shouldClear
=
true
)
{
// `blur` is needed to clear slash commands autocomplete cache if event fired.
// `blur` is needed to clear slash commands autocomplete cache if event fired.
...
...
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