Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)

Browse source 
* Allow multiple pinned statuses to be shown and make them be ordered by pinned date

* Set timestamps NOT NULL

* Make single-line pinned_statuses

* Spec for pinned_statuses

* Remove redundant empty line
This commit is contained in:
nullkal 2017-08-26 01:50:52 +09:00 • committed by Eugen Rochko
parent fb8aa2b3ba
commit c2af138113
6 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -14,7 +14,7 @@ class AccountsController < ApplicationController
return
end
@pinned_statuses = cache_collection(@account.pinned_statuses.limit(1), Status) unless media_requested?
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) unless media_requested?
@statuses = filtered_statuses.paginate_by_max_id(20, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses, Status)
@next_url = next_url unless @statuses.empty?