Skip to content

Commit df667a8

Browse files
committed
Revert sorting by user_last_sign_in_at
1 parent ecbb5ed commit df667a8

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

app/controllers/users_controller.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ class UsersController < ApplicationController
22
before_filter :authenticate_user!
33

44
def index
5-
# I would like nulls to go last but ransack... https://github.com/activerecord-hackery/ransack/issues/443
6-
search_and_load_members current_organization.members.active, {s: 'user_last_sign_in_at desc'}
5+
search_and_load_members current_organization.members.active, {s: 'member_uid asc'}
76
end
87

98
def manage

spec/controllers/users_controller_spec.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,12 @@
4040
describe "GET #index" do
4141
before { login(user) }
4242

43-
it 'sorts the users by their user_last_sign_in_at desc by default' do
43+
it 'sorts the users by their member_uid asc desc by default' do
4444
member.increment!(:member_uid, Member.maximum(:member_uid) + 1)
45-
member.user.update_attribute(
46-
:last_sign_in_at,
47-
DateTime.now
48-
)
4945

5046
get :index
5147

52-
expect(assigns(:members).first).to eq(member)
48+
expect(assigns(:members).last).to eq(member)
5349
end
5450

5551
it 'allows to sort by member_uid' do

0 commit comments

Comments
 (0)