diff options
| author | Jeong Arm <kjwonmail@gmail.com> | 2021-11-27 06:12:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 22:12:27 +0100 |
| commit | 1c826471e7d964f0fdb2dc2b89dcd5a19c017538 (patch) | |
| tree | 0b8ed29d7c23813504d15af05db2e341ba206d44 /app/controllers/admin/statuses_controller.rb | |
| parent | 3f382e337d5c40db18995a88c0bf6b1b34f031b7 (diff) | |
Fix admin statuses order(#16937) (#16969)
* Fix #16937 * Add test for statuses order
Diffstat (limited to 'app/controllers/admin/statuses_controller.rb')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 58a0eb84c..b3fd4c424 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -14,7 +14,7 @@ module Admin @statuses = @account.statuses.where(visibility: [:public, :unlisted]) if params[:media] - @statuses.merge!(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)).reorder('statuses.id desc') + @statuses = @statuses.merge(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)).reorder('statuses.id desc') end @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PER_PAGE) |