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
ad46dcca
Commit
ad46dcca
authored
Aug 18, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue boards closed list displaying empty label
Closes #36650
parent
6ed01ebf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
app/assets/javascripts/boards/components/issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+1
-1
spec/javascripts/boards/issue_card_spec.js
spec/javascripts/boards/issue_card_spec.js
+19
-0
No files found.
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
ad46dcca
...
@@ -97,7 +97,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
...
@@ -97,7 +97,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
return
`Avatar for
${
assignee
.
name
}
`
;
return
`Avatar for
${
assignee
.
name
}
`
;
},
},
showLabel
(
label
)
{
showLabel
(
label
)
{
if
(
!
this
.
list
||
!
label
)
return
tru
e
;
if
(
!
label
.
id
)
return
fals
e
;
return
true
;
return
true
;
},
},
filterByLabel
(
label
,
e
)
{
filterByLabel
(
label
,
e
)
{
...
...
spec/javascripts/boards/issue_card_spec.js
View file @
ad46dcca
...
@@ -278,6 +278,25 @@ describe('Issue card component', () => {
...
@@ -278,6 +278,25 @@ describe('Issue card component', () => {
nodes
.
includes
(
label1
.
color
),
nodes
.
includes
(
label1
.
color
),
).
toBe
(
true
);
).
toBe
(
true
);
});
});
it
(
'
does not render label if label does not have an ID
'
,
(
done
)
=>
{
component
.
issue
.
addLabel
(
new
ListLabel
({
title
:
'
closed
'
,
}));
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
component
.
$el
.
querySelectorAll
(
'
.label
'
).
length
,
).
toBe
(
2
);
expect
(
component
.
$el
.
textContent
,
).
not
.
toContain
(
'
closed
'
);
done
();
})
.
catch
(
done
.
fail
);
});
});
});
});
});
});
});
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