diff options
| author | Starfall <us@starfall.systems> | 2020-09-02 01:15:02 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-09-02 01:15:02 -0500 |
| commit | fd0b806603dbd632d259d06af789c7195c7264dc (patch) | |
| tree | a9ba1b09763ca15a96f927e361bb878b9833bc7d /app/controllers/api/v1/admin | |
| parent | a43c1d3f56c128c992f34b8e2b968de14e02ac48 (diff) | |
| parent | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/api/v1/admin')
| -rw-r--r-- | app/controllers/api/v1/admin/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/admin/reports_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb index c35ea5ab2..24c7fbef1 100644 --- a/app/controllers/api/v1/admin/accounts_controller.rb +++ b/app/controllers/api/v1/admin/accounts_controller.rb @@ -79,7 +79,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController private def set_accounts - @accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite]).paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) + @accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite]).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) end def set_account diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb index 1d48d3160..c8f4cd8d8 100644 --- a/app/controllers/api/v1/admin/reports_controller.rb +++ b/app/controllers/api/v1/admin/reports_controller.rb @@ -63,7 +63,7 @@ class Api::V1::Admin::ReportsController < Api::BaseController private def set_reports - @reports = filtered_reports.order(id: :desc).with_accounts.paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) + @reports = filtered_reports.order(id: :desc).with_accounts.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) end def set_report |