github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 14:08:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Always serialize the correct attributes for DirectoryItems (#13510)

Browse Source
This commit is contained in:
Mark VanLandingham
2021-06-23 14:55:17 -05:00
committed by GitHub
parent 1702922a7c
commit 60a76737dc
5 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/directory_items_controller.rb
View File

@ -28,7 +28,8 @@ class DirectoryItemsController < ApplicationController
order = params[:order] || DirectoryColumn.automatic_column_names.first
dir = params[:asc] ? 'ASC' : 'DESC'
if DirectoryColumn.active_column_names.include?(order.to_sym)
active_directory_column_names = DirectoryColumn.active_column_names
if active_directory_column_names.include?(order.to_sym)
result = result.order("directory_items.#{order} #{dir}, directory_items.id")
elsif params[:order] === 'username'
result = result.order("users.#{order} #{dir}, directory_items.id")
@ -108,6 +109,8 @@ class DirectoryItemsController < ApplicationController
serializer_opts[:plugin_column_ids] = params[:plugin_column_ids]&.split("|")&.map(&:to_i)
end
serializer_opts[:attributes] = active_directory_column_names
serialized = serialize_data(result, DirectoryItemSerializer, serializer_opts)
render_json_dump(directory_items: serialized,
meta: {