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
39c75124
Commit
39c75124
authored
Nov 18, 2019
by
Scott Stern
Committed by
Tim Zallmann
Nov 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add correct link for milestone in issuable
parent
04804f6e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
5 deletions
+25
-5
app/assets/javascripts/issuables_list/components/issuable.vue
...assets/javascripts/issuables_list/components/issuable.vue
+13
-5
ee/35448-issuables-list-refactor-when-clicking-milestone-adds-search-filter.yml
...t-refactor-when-clicking-milestone-adds-search-filter.yml
+5
-0
spec/frontend/issuables_list/components/issuable_spec.js
spec/frontend/issuables_list/components/issuable_spec.js
+7
-0
No files found.
app/assets/javascripts/issuables_list/components/issuable.vue
View file @
39c75124
...
...
@@ -54,6 +54,11 @@ export default {
},
},
computed
:
{
milestoneLink
()
{
const
{
title
}
=
this
.
issuable
.
milestone
;
return
this
.
issuableLink
({
milestone_title
:
title
});
},
hasLabels
()
{
return
Boolean
(
this
.
issuable
.
labels
&&
this
.
issuable
.
labels
.
length
);
},
...
...
@@ -167,8 +172,11 @@ export default {
color
:
label
.
text_color
,
};
},
issuableLink
(
params
)
{
return
mergeUrlParams
(
params
,
this
.
baseUrl
);
},
labelHref
({
name
})
{
return
mergeUrlParams
({
'
label_name[]
'
:
name
},
this
.
baseUrl
);
return
this
.
issuableLink
({
'
label_name[]
'
:
name
}
);
},
onSelect
(
ev
)
{
this
.
$emit
(
'
select
'
,
{
...
...
@@ -216,9 +224,9 @@ export default {
></i>
<gl-link
:href=
"issuable.web_url"
>
{{
issuable
.
title
}}
</gl-link>
</span>
<span
v-if=
"issuable.has_tasks"
class=
"ml-1 task-status d-none d-sm-inline-block"
>
{{
issuable
.
task_status
}}
</span>
<span
v-if=
"issuable.has_tasks"
class=
"ml-1 task-status d-none d-sm-inline-block"
>
{{
issuable
.
task_status
}}
</span>
</div>
<div
class=
"issuable-info"
>
...
...
@@ -233,7 +241,7 @@ export default {
v-if=
"issuable.milestone"
v-gl-tooltip
class=
"d-none d-sm-inline-block mr-1 js-milestone"
:href=
"
issuable.milestone.web_url
"
:href=
"
milestoneLink
"
:title=
"milestoneTooltipText"
>
<i
class=
"fa fa-clock-o"
></i>
...
...
ee/35448-issuables-list-refactor-when-clicking-milestone-adds-search-filter.yml
0 → 100644
View file @
39c75124
---
title
:
Add correct link to milestone in groups for issuables list after refactor
merge_request
:
author
:
type
:
fixed
spec/frontend/issuables_list/components/issuable_spec.js
View file @
39c75124
...
...
@@ -196,6 +196,13 @@ describe('Issuable component', () => {
`
${
formatDate
(
dueDate
,
DATE_FORMAT
)}
(
${
expectedTooltipPart
}
)`
,
);
});
it
(
'
renders milestone with the correct href
'
,
()
=>
{
const
{
title
}
=
issuable
.
milestone
;
const
expected
=
mergeUrlParams
({
milestone_title
:
title
},
TEST_BASE_URL
);
expect
(
findMilestone
().
attributes
(
'
href
'
)).
toBe
(
expected
);
});
});
describe
.
each
`
...
...
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