mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo in admin/status_controller.rb (#4679)

fix-uploadarea-keyup-for-upstream
HIKARU KOBORI 2017-08-24 11:03:52 +09:00 committed by Eugen Rochko
parent 829e2e8c5d
commit 2c6a85832c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/statuses_controller.rb
View File

@ -9,7 +9,7 @@ module Admin
before_action :set_account before_action :set_account
before_action :set_status, only: [:update, :destroy] before_action :set_status, only: [:update, :destroy]
PAR_PAGE = 20 PER_PAGE = 20
def index def index
@statuses = @account.statuses @statuses = @account.statuses
@ -17,7 +17,7 @@ module Admin
account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
@statuses.merge!(Status.where(id: account_media_status_ids)) @statuses.merge!(Status.where(id: account_media_status_ids))
end end
@statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PAR_PAGE) @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PER_PAGE)
@form = Form::StatusBatch.new @form = Form::StatusBatch.new
end end