Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Make columns of user and ordergroup lists sortable

Browse source 
This commit implements the sort functionality for the user lists (by name, email, last_activity) and ordergroup lists (by name).
It is a first attempt addressing issue #560.
This commit is contained in:
Harald Reingruber 2022-05-27 17:06:25 +02:00 • committed by GitHub
parent 8f94403ccf
commit 0a6345c60b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 278 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/ordergroups_controller.rb
View file

@ -2,7 +2,7 @@ class Admin::OrdergroupsController < Admin::BaseController
inherit_resources
def index
@ordergroups = Ordergroup.undeleted.order('name ASC')
@ordergroups = Ordergroup.undeleted.sort_by_param(params["sort"])
if request.format.csv?
send_data OrdergroupsCsv.new(@ordergroups).to_csv, filename: 'ordergroups.csv', type: 'text/csv'

4
app/controllers/admin/users_controller.rb
View file

@ -3,6 +3,8 @@ class Admin::UsersController < Admin::BaseController
def index
@users = params[:show_deleted] ? User.deleted : User.undeleted
@users = @users.sort_by_param(params["sort"])
@users = @users.includes(:mail_delivery_status)
if request.format.csv?
@ -12,7 +14,7 @@ class Admin::UsersController < Admin::BaseController
# if somebody uses the search field:
@users = @users.natural_search(params[:user_name]) unless params[:user_name].blank?
@users = @users.natural_order.page(params[:page]).per(@per_page)
@users = @users.page(params[:page]).per(@per_page)
end
def destroy