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
0f366c74
Commit
0f366c74
authored
Oct 06, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed default group sort option
Closes #38808
parent
05054803
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
app/controllers/dashboard/groups_controller.rb
app/controllers/dashboard/groups_controller.rb
+1
-1
changelogs/unreleased/group-sort-dropdown-blank.yml
changelogs/unreleased/group-sort-dropdown-blank.yml
+5
-0
spec/features/dashboard/group_spec.rb
spec/features/dashboard/group_spec.rb
+6
-0
No files found.
app/controllers/dashboard/groups_controller.rb
View file @
0f366c74
class
Dashboard::GroupsController
<
Dashboard
::
ApplicationController
class
Dashboard::GroupsController
<
Dashboard
::
ApplicationController
def
index
def
index
@sort
=
params
[
:sort
]
||
'
i
d_desc'
@sort
=
params
[
:sort
]
||
'
create
d_desc'
@groups
=
@groups
=
if
params
[
:parent_id
]
&&
Group
.
supports_nested_groups?
if
params
[
:parent_id
]
&&
Group
.
supports_nested_groups?
...
...
changelogs/unreleased/group-sort-dropdown-blank.yml
0 → 100644
View file @
0f366c74
---
title
:
Fixed group sort dropdown defaulting to empty
merge_request
:
author
:
type
:
fixed
spec/features/dashboard/group_spec.rb
View file @
0f366c74
...
@@ -5,6 +5,12 @@ RSpec.describe 'Dashboard Group' do
...
@@ -5,6 +5,12 @@ RSpec.describe 'Dashboard Group' do
sign_in
(
create
(
:user
))
sign_in
(
create
(
:user
))
end
end
it
'defaults sort dropdown to last created'
do
visit
dashboard_groups_path
expect
(
page
).
to
have_button
(
'Last created'
)
end
it
'creates new group'
,
js:
true
do
it
'creates new group'
,
js:
true
do
visit
dashboard_groups_path
visit
dashboard_groups_path
find
(
'.btn-new'
).
trigger
(
'click'
)
find
(
'.btn-new'
).
trigger
(
'click'
)
...
...
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