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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fdc94907
Commit
fdc94907
authored
Apr 15, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with not being able to sort and filter
parent
471d7a5b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
3 deletions
+47
-3
app/assets/javascripts/issuable.js.coffee
app/assets/javascripts/issuable.js.coffee
+1
-1
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+11
-2
spec/features/issues/filter_issues_spec.rb
spec/features/issues/filter_issues_spec.rb
+35
-0
No files found.
app/assets/javascripts/issuable.js.coffee
View file @
fdc94907
...
...
@@ -69,7 +69,7 @@ issuable_created = false
updateStateFilters
:
->
stateFilters
=
$
(
'.issues-state-filters'
)
stateFilters
=
$
(
'.issues-state-filters
, .dropdown-menu-sort
'
)
newParams
=
{}
paramKeys
=
[
'author_id'
,
'milestone_title'
,
'assignee_id'
,
'issue_search'
]
...
...
app/views/shared/_sort_dropdown.html.haml
View file @
fdc94907
...
...
@@ -6,26 +6,35 @@
-
else
=
sort_title_recently_created
%b
.caret
%ul
.dropdown-menu.dropdown-menu-align-right
%ul
.dropdown-menu.dropdown-menu-align-right
.dropdown-menu-sort
%li
=
link_to
page_filter_path
(
sort:
sort_value_recently_created
)
do
=
sort_title_recently_created
%li
=
link_to
page_filter_path
(
sort:
sort_value_oldest_created
)
do
=
sort_title_oldest_created
%li
=
link_to
page_filter_path
(
sort:
sort_value_recently_updated
)
do
=
sort_title_recently_updated
%li
=
link_to
page_filter_path
(
sort:
sort_value_oldest_updated
)
do
=
sort_title_oldest_updated
%li
=
link_to
page_filter_path
(
sort:
sort_value_milestone_soon
)
do
=
sort_title_milestone_soon
%li
=
link_to
page_filter_path
(
sort:
sort_value_milestone_later
)
do
=
sort_title_milestone_later
-
if
controller
.
controller_name
==
'issues'
||
controller
.
action_name
==
'issues'
%li
=
link_to
page_filter_path
(
sort:
sort_value_due_date_soon
)
do
=
sort_title_due_date_soon
%li
=
link_to
page_filter_path
(
sort:
sort_value_due_date_later
)
do
=
sort_title_due_date_later
%li
=
link_to
page_filter_path
(
sort:
sort_value_upvotes
)
do
=
sort_title_upvotes
%li
=
link_to
page_filter_path
(
sort:
sort_value_downvotes
)
do
=
sort_title_downvotes
spec/features/issues/filter_issues_spec.rb
View file @
fdc94907
...
...
@@ -190,7 +190,9 @@ describe 'Filter issues', feature: true do
expect
(
page
).
to_not
have_selector
(
'.issue'
)
end
end
end
context
'text and dropdown options'
,
js:
true
do
it
'should filter by text and label'
do
fill_in
'issue_search'
,
with:
'Bug'
...
...
@@ -260,4 +262,37 @@ describe 'Filter issues', feature: true do
end
end
end
describe
'filter issues and sort'
,
js:
true
do
before
do
label
=
create
(
:label
,
project:
project
,
title:
'bug'
)
bug_one
=
create
(
:issue
,
title:
"Frontend"
,
project:
project
)
bug_two
=
create
(
:issue
,
title:
"Bug 2"
,
project:
project
)
bug_one
.
labels
<<
project
.
labels
.
find_by
(
title:
'bug'
)
bug_two
.
labels
<<
project
.
labels
.
find_by
(
title:
'bug'
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
)
end
it
'should be able to filter and sort issues'
do
click_button
'Label'
page
.
within
'.labels-filter'
do
click_link
'bug'
end
page
.
within
'.issues-list'
do
expect
(
page
).
to
have_selector
(
'.issue'
,
count:
2
)
end
click_button
'Last created'
page
.
within
'.dropdown-menu-sort'
do
click_link
'Oldest created'
end
page
.
within
'.issues-list'
do
expect
(
first
(
'.issue'
)).
to
have_content
(
'Frontend'
)
end
end
end
end
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