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
Léo-Paul Géneau
gitlab-ce
Commits
7df4b16b
Commit
7df4b16b
authored
Apr 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with not being able to search text & filter
parent
31b1dc3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/javascripts/issuable.js.coffee
app/assets/javascripts/issuable.js.coffee
+10
-1
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
No files found.
app/assets/javascripts/issuable.js.coffee
View file @
7df4b16b
...
@@ -23,7 +23,16 @@ issuable_created = false
...
@@ -23,7 +23,16 @@ issuable_created = false
.
on
'keyup'
,
->
.
on
'keyup'
,
->
clearTimeout
(
@
timer
)
clearTimeout
(
@
timer
)
@
timer
=
setTimeout
(
->
@
timer
=
setTimeout
(
->
Issuable
.
filterResults
$
(
'#issue_search_form'
)
$search
=
$
(
'#issue_search'
)
$form
=
$
(
'.js-filter-form'
)
$input
=
$
(
"input[name='
#{
$search
.
attr
(
'name'
)
}
']"
,
$form
)
if
$input
.
length
is
0
$form
.
append
"<input type='hidden' name='
#{
$search
.
attr
(
'name'
)
}
' value='
#{
$search
.
val
()
}
'/>"
else
$input
.
val
$search
.
val
()
Issuable
.
filterResults
$form
,
500
)
,
500
)
toggleLabelFilters
:
->
toggleLabelFilters
:
->
...
...
app/views/shared/issuable/_filter.html.haml
View file @
7df4b16b
.issues-filters
.issues-filters
.issues-details-filters.
gray
-content-block.second-block
.issues-details-filters.
row
-content-block.second-block
=
form_tag
page_filter_path
(
without:
[
:assignee_id
,
:author_id
,
:milestone_title
,
:label_name
,
:issue_search
]),
method: :get
,
class:
'filter-form js-filter-form'
do
=
form_tag
page_filter_path
(
without:
[
:assignee_id
,
:author_id
,
:milestone_title
,
:label_name
,
:issue_search
]),
method: :get
,
class:
'filter-form js-filter-form'
do
-
if
params
[
:issue_search
].
present?
-
if
params
[
:issue_search
].
present?
=
hidden_field_tag
:issue_search
,
params
[
:issue_search
]
=
hidden_field_tag
:issue_search
,
params
[
:issue_search
]
...
...
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