Skip to content
Snippets Groups Projects

Update group member search

Merged Etienne Baqué requested to merge 262875-seat-members-search-be into master
Compare and Show latest version
2 files
+ 5
4
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -78,11 +78,11 @@ def log_audit_event(member)
end
def paginate_billable_from_user_ids(user_ids, params = {})
sorted_ids = params[:search].present? ? user_ids : user_ids.sort
sorted_ids = params[:sort].present? ? user_ids : user_ids.sort
paginated = paginate(::Kaminari.paginate_array(sorted_ids))
users_as_hash = ::User.id_in(paginated).index_by(&:id)
order_by = params[:sort] || sort_value_name
users_as_hash = ::User.id_in(paginated).sort_by_attribute(order_by).index_by(&:id)
# map! ensures same paginatable array is manipulated
# instead of creating a new non-paginatable array
Loading