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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
2446f853
Commit
2446f853
authored
Apr 05, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'close-issue-bug' into 'master'
Fix data check in update issue response See merge request !3548
parents
a1c794c5
1eeec7c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/issue.js.coffee
app/assets/javascripts/issue.js.coffee
+1
-1
spec/javascripts/issue_spec.js.coffee
spec/javascripts/issue_spec.js.coffee
+3
-3
No files found.
app/assets/javascripts/issue.js.coffee
View file @
2446f853
...
@@ -34,7 +34,7 @@ class @Issue
...
@@ -34,7 +34,7 @@ class @Issue
issueStatus
=
if
isClose
then
'close'
else
'open'
issueStatus
=
if
isClose
then
'close'
else
'open'
new
Flash
(
issueFailMessage
,
'alert'
)
new
Flash
(
issueFailMessage
,
'alert'
)
success
:
(
data
,
textStatus
,
jqXHR
)
->
success
:
(
data
,
textStatus
,
jqXHR
)
->
if
data
.
saved
if
'id'
of
data
$
(
document
).
trigger
(
'issuable:change'
);
$
(
document
).
trigger
(
'issuable:change'
);
if
isClose
if
isClose
$
(
'a.btn-close'
).
addClass
(
'hidden'
)
$
(
'a.btn-close'
).
addClass
(
'hidden'
)
...
...
spec/javascripts/issue_spec.js.coffee
View file @
2446f853
...
@@ -29,8 +29,8 @@ describe 'reopen/close issue', ->
...
@@ -29,8 +29,8 @@ describe 'reopen/close issue', ->
spyOn
(
jQuery
,
'ajax'
).
and
.
callFake
(
req
)
->
spyOn
(
jQuery
,
'ajax'
).
and
.
callFake
(
req
)
->
expect
(
req
.
type
).
toBe
(
'PUT'
)
expect
(
req
.
type
).
toBe
(
'PUT'
)
expect
(
req
.
url
).
toBe
(
'http://gitlab.com/issues/6/close'
)
expect
(
req
.
url
).
toBe
(
'http://gitlab.com/issues/6/close'
)
req
.
success
saved
:
true
req
.
success
id
:
34
$btnClose
=
$
(
'a.btn-close'
)
$btnClose
=
$
(
'a.btn-close'
)
$btnReopen
=
$
(
'a.btn-reopen'
)
$btnReopen
=
$
(
'a.btn-reopen'
)
expect
(
$btnReopen
).
toBeHidden
()
expect
(
$btnReopen
).
toBeHidden
()
...
@@ -94,7 +94,7 @@ describe 'reopen/close issue', ->
...
@@ -94,7 +94,7 @@ describe 'reopen/close issue', ->
spyOn
(
jQuery
,
'ajax'
).
and
.
callFake
(
req
)
->
spyOn
(
jQuery
,
'ajax'
).
and
.
callFake
(
req
)
->
expect
(
req
.
type
).
toBe
(
'PUT'
)
expect
(
req
.
type
).
toBe
(
'PUT'
)
expect
(
req
.
url
).
toBe
(
'http://gitlab.com/issues/6/reopen'
)
expect
(
req
.
url
).
toBe
(
'http://gitlab.com/issues/6/reopen'
)
req
.
success
saved
:
true
req
.
success
id
:
34
$btnClose
=
$
(
'a.btn-close'
)
$btnClose
=
$
(
'a.btn-close'
)
$btnReopen
=
$
(
'a.btn-reopen'
)
$btnReopen
=
$
(
'a.btn-reopen'
)
...
...
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