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
02eb6a43
Commit
02eb6a43
authored
Apr 24, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include URL query param in epics path when params are present
parent
ec4c18a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
ee/app/assets/javascripts/roadmap/index.js
ee/app/assets/javascripts/roadmap/index.js
+6
-1
No files found.
ee/app/assets/javascripts/roadmap/index.js
View file @
02eb6a43
...
@@ -27,6 +27,7 @@ export default () => {
...
@@ -27,6 +27,7 @@ export default () => {
},
},
data
()
{
data
()
{
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
filterQueryString
=
window
.
location
.
search
.
substring
(
1
);
// Construct Epic API path to include
// Construct Epic API path to include
// `start_date` & `end_date` query params to get list of
// `start_date` & `end_date` query params to get list of
...
@@ -36,7 +37,11 @@ export default () => {
...
@@ -36,7 +37,11 @@ export default () => {
const
end
=
timeframe
[
TIMEFRAME_LENGTH
-
1
];
const
end
=
timeframe
[
TIMEFRAME_LENGTH
-
1
];
const
startDate
=
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
;
const
startDate
=
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
;
const
endDate
=
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()}
`
;
const
endDate
=
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()}
`
;
const
epicsPath
=
`
${
dataset
.
epicsPath
}
?start_date=
${
startDate
}
&end_date=
${
endDate
}
`
;
let
epicsPath
=
`
${
dataset
.
epicsPath
}
?start_date=
${
startDate
}
&end_date=
${
endDate
}
`
;
if
(
filterQueryString
)
{
epicsPath
+=
`&
${
filterQueryString
}
`
;
}
const
store
=
new
RoadmapStore
(
parseInt
(
dataset
.
groupId
,
0
),
timeframe
);
const
store
=
new
RoadmapStore
(
parseInt
(
dataset
.
groupId
,
0
),
timeframe
);
const
service
=
new
RoadmapService
(
epicsPath
);
const
service
=
new
RoadmapService
(
epicsPath
);
...
...
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