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
62e82ba9
Commit
62e82ba9
authored
6 years ago
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix duplicate boardsStore variable in milestone select
parent
cebd595e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+4
-4
changelogs/unreleased/winh-milestone-select.yml
changelogs/unreleased/winh-milestone-select.yml
+5
-0
No files found.
app/assets/javascripts/milestone_select.js
View file @
62e82ba9
...
@@ -155,7 +155,7 @@ export default class MilestoneSelect {
...
@@ -155,7 +155,7 @@ export default class MilestoneSelect {
const
{
$el
,
e
}
=
clickEvent
;
const
{
$el
,
e
}
=
clickEvent
;
let
selected
=
clickEvent
.
selectedObj
;
let
selected
=
clickEvent
.
selectedObj
;
let
data
,
boardsStore
;
let
data
,
modalStoreFilter
;
if
(
!
selected
)
return
;
if
(
!
selected
)
return
;
if
(
options
.
handleClick
)
{
if
(
options
.
handleClick
)
{
...
@@ -179,11 +179,11 @@ export default class MilestoneSelect {
...
@@ -179,11 +179,11 @@ export default class MilestoneSelect {
}
}
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
boardsStore
=
ModalStore
.
store
.
filter
;
modalStoreFilter
=
ModalStore
.
store
.
filter
;
}
}
if
(
boardsStore
)
{
if
(
modalStoreFilter
)
{
boardsStore
[
$dropdown
.
data
(
'
fieldName
'
)]
=
selected
.
name
;
modalStoreFilter
[
$dropdown
.
data
(
'
fieldName
'
)]
=
selected
.
name
;
e
.
preventDefault
();
e
.
preventDefault
();
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/winh-milestone-select.yml
0 → 100644
View file @
62e82ba9
---
title
:
Fix milestone select in issue sidebar of issue boards
merge_request
:
23625
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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