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
a7443e42
Commit
a7443e42
authored
Jul 16, 2020
by
Jarka Košanová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix displaying roadmap for epics without dates
- includes pdated translations
parent
84eb4944
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletion
+18
-1
ee/app/assets/javascripts/roadmap/mixins/common_mixin.js
ee/app/assets/javascripts/roadmap/mixins/common_mixin.js
+3
-1
ee/changelogs/unreleased/214026-fix-roadmap-date-display.yml
ee/changelogs/unreleased/214026-fix-roadmap-date-display.yml
+5
-0
ee/spec/frontend/roadmap/components/epic_item_spec.js
ee/spec/frontend/roadmap/components/epic_item_spec.js
+7
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/roadmap/mixins/common_mixin.js
View file @
a7443e42
...
...
@@ -75,7 +75,9 @@ export default {
};
},
timeframeString
(
roadmapItem
)
{
if
(
roadmapItem
.
startDateUndefined
)
{
if
(
roadmapItem
.
startDateUndefined
&&
roadmapItem
.
endDateUndefined
)
{
return
sprintf
(
s__
(
'
GroupRoadmap|No start and end date
'
));
}
else
if
(
roadmapItem
.
startDateUndefined
)
{
return
sprintf
(
s__
(
'
GroupRoadmap|No start date – %{dateWord}
'
),
{
dateWord
:
dateInWords
(
this
.
endDate
,
true
),
});
...
...
ee/changelogs/unreleased/214026-fix-roadmap-date-display.yml
0 → 100644
View file @
a7443e42
---
title
:
Display correct information on Roadmap when an epic has no start and due date
merge_request
:
37093
author
:
type
:
fixed
ee/spec/frontend/roadmap/components/epic_item_spec.js
View file @
a7443e42
...
...
@@ -103,6 +103,13 @@ describe('EpicItemComponent', () => {
expect
(
wrapper
.
vm
.
timeframeString
(
mockEpic
)).
toBe
(
'
Jul 10, 2017 – Jun 2, 2018
'
);
});
it
(
'
returns timeframe string correctly when no dates are defined
'
,
()
=>
{
const
epic
=
{
...
mockEpic
,
endDateUndefined
:
true
,
startDateUndefined
:
true
};
wrapper
=
createComponent
({
epic
});
expect
(
wrapper
.
vm
.
timeframeString
(
epic
)).
toBe
(
'
No start and end date
'
);
});
it
(
'
returns timeframe string correctly when only start date is defined
'
,
()
=>
{
const
epic
=
{
...
mockEpic
,
endDateUndefined
:
true
};
wrapper
=
createComponent
({
epic
});
...
...
locale/gitlab.pot
View file @
a7443e42
...
...
@@ -11653,6 +11653,9 @@ msgstr ""
msgid "GroupRoadmap|%{startDateInWords} – %{endDateInWords}"
msgstr ""
msgid "GroupRoadmap|No start and end date"
msgstr ""
msgid "GroupRoadmap|No start date – %{dateWord}"
msgstr ""
...
...
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