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
236d6595
Commit
236d6595
authored
Mar 08, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed previous filter code
parent
d701b39d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
28 deletions
+3
-28
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+2
-16
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+1
-7
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+0
-5
No files found.
app/assets/javascripts/labels_select.js
View file @
236d6595
...
@@ -353,31 +353,17 @@
...
@@ -353,31 +353,17 @@
return
;
return
;
}
}
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
)
&&
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
!
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
boardsModel
=
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
;
}
else
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
boardsModel
=
gl
.
issueBoards
.
ModalStore
.
store
.
filter
;
boardsModel
=
gl
.
issueBoards
.
ModalStore
.
store
.
filter
;
}
}
if
(
boardsModel
)
{
if
(
boardsModel
)
{
if
(
label
.
isAny
)
{
if
(
label
.
isAny
)
{
boardsModel
[
'
label_name
'
]
=
[];
boardsModel
[
'
label_name
'
]
=
[];
}
}
else
if
(
$el
.
hasClass
(
'
is-active
'
))
{
else
if
(
$el
.
hasClass
(
'
is-active
'
))
{
boardsModel
[
'
label_name
'
].
push
(
label
.
title
);
boardsModel
[
'
label_name
'
].
push
(
label
.
title
);
}
}
else
{
var
filters
=
boardsModel
[
'
label_name
'
];
filters
=
filters
.
filter
(
function
(
filteredLabel
)
{
return
filteredLabel
!==
label
.
title
;
});
boardsModel
[
'
label_name
'
]
=
filters
;
}
if
(
!
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
}
e
.
preventDefault
();
e
.
preventDefault
();
return
;
return
;
}
}
...
...
app/assets/javascripts/milestone_select.js
View file @
236d6595
...
@@ -124,18 +124,12 @@
...
@@ -124,18 +124,12 @@
return
;
return
;
}
}
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
)
&&
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
!
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
boardsStore
=
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
;
}
else
if
(
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
boardsStore
=
gl
.
issueBoards
.
ModalStore
.
store
.
filter
;
boardsStore
=
gl
.
issueBoards
.
ModalStore
.
store
.
filter
;
}
}
if
(
boardsStore
)
{
if
(
boardsStore
)
{
boardsStore
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
boardsStore
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
if
(
!
$dropdown
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
}
e
.
preventDefault
();
e
.
preventDefault
();
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
if
(
selected
.
name
!=
null
)
{
if
(
selected
.
name
!=
null
)
{
...
...
app/assets/javascripts/users_select.js
View file @
236d6595
...
@@ -217,11 +217,6 @@
...
@@ -217,11 +217,6 @@
}
}
if
(
$el
.
closest
(
'
.add-issues-modal
'
).
length
)
{
if
(
$el
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
ModalStore
.
store
.
filter
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
gl
.
issueBoards
.
ModalStore
.
store
.
filter
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
}
else
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
))
{
selectedId
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
e
.
preventDefault
();
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
selectedId
=
user
.
id
;
selectedId
=
user
.
id
;
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
...
...
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