Skip to content

Fix sort users by their member_uid #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: vagrant use ruby 2.2.0 : forgot to update comments
merged 1 commit into from
Jan 30, 2018
Merged

Fix sort users by their member_uid #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class UsersController < ApplicationController

def index
@search = current_organization.users.ransack(params[:q])
@search.sorts = 'members_member_uid asc' if @search.sorts.empty?

@users = @search
.result(distinct: false)
Expand Down
17 changes: 16 additions & 1 deletion spec/controllers/users_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,26 @@
before { set_browser_locale("ca") }

describe "GET #index" do
before { login(user) }

it 'sorts the users by their member_uid' do
member.update_attribute(:member_uid, 100)

get :index

expect(assigns(:users)).to eq([
another_user,
admin_user,
wrong_user,
empty_email_user,
user,
])
end

context 'when a user has many memberships' do
let!(:member_in_another_organization) { Fabricate(:member, user: user) }

before do
login(user)
member.account.update_attribute(
:balance,
Time.parse('13:33').seconds_since_midnight
Expand Down