Allow setting list_count in various admin list pages #2549

This commit is contained in:
Kijin Sung 2026-03-10 13:32:42 +09:00
parent 8901cb6e36
commit 44cf008ac7
4 changed files with 45 additions and 59 deletions

View file

@ -44,7 +44,7 @@ class MemberAdminModel extends Member
$args = new stdClass();
$args->is_admin = Context::get('is_admin') === 'Y' ? 'Y' : null;
$args->status = Context::get('is_denied') === 'Y' ? 'DENIED' : null;
$args->selected_group_srl = Context::get('selected_group_srl');
$args->selected_group_srl = intval(Context::get('selected_group_srl')) ?: null;
$filter = Context::get('filter_type');
switch($filter)
@ -128,21 +128,11 @@ class MemberAdminModel extends Member
}
// Change the query id if selected_group_srl exists (for table join)
$sort_order = Context::get('sort_order');
$sort_order = Context::get('sort_order') === 'desc' ? 'desc' : 'asc';
$sort_index = Context::get('sort_index');
if(!$sort_index || !in_array($sort_index, ['user_id', 'email_address', 'phone_number', 'user_name', 'nick_name', 'regdate', 'last_login']))
{
$sort_index = "list_order";
}
if(!$sort_order)
{
$sort_order = 'asc';
}
if($sort_order != 'asc')
{
$sort_order = 'desc';
$sort_index = 'list_order';
}
if($args->selected_group_srl)
@ -158,13 +148,13 @@ class MemberAdminModel extends Member
$args->sort_order = $sort_order;
Context::set('sort_order', $sort_order);
// Other variables
$args->page = Context::get('page');
$args->list_count = 40;
$args->page_count = 10;
$output = executeQuery($query_id, $args);
return $output;
// Other variables
$args->list_count = intval(Context::get('list_count')) ?: 30;
$args->page_count = 10;
$args->page = max(1, intval(Context::get('page')));
return executeQueryArray($query_id, $args);
}
/**