IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 03:10:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include the current user at the top AND in the user directory

Browse Source
This commit is contained in:
Robin Ward 2015-03-24 16:19:15 -04:00
parent 1e3e4135a3
commit 8fd339b994
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/directory_items_controller.rb
View File

@ -8,10 +8,6 @@ class DirectoryItemsController < ApplicationController
result = DirectoryItem.where(period_type: period_type).includes(:user)
if current_user.present?
result = result.order("CASE WHEN users.id = #{current_user.id.to_i} THEN 0 ELSE 1 END")
end
order = params[:order] || DirectoryItem.headings.first
if DirectoryItem.headings.include?(order.to_sym)
dir = params[:asc] ? 'ASC' : 'DESC'
@ -44,9 +40,14 @@ class DirectoryItemsController < ApplicationController
more_params = params.slice(:period, :order, :asc)
more_params[:page] = page + 1
render_json_dump directory_items: serialize_data(result, DirectoryItemSerializer),
total_rows_directory_items: result_count,
load_more_directory_items: directory_items_path(more_params)
# Put yourself at the top of the first page
if current_user.present? && page == 0 && result[0].user_id != current_user.id
your_item = DirectoryItem.where(period_type: period_type, user_id: current_user.id).first
result.insert(0, your_item) if your_item
end
render_json_dump(directory_items: serialize_data(result, DirectoryItemSerializer),
total_rows_directory_items: result_count,
load_more_directory_items: directory_items_path(more_params))
end
end