github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 13:35:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Revert 3 commits for plugin API to add directory columns (#13423)

Browse Source
This commit is contained in:
Mark VanLandingham
2021-06-17 12:37:37 -05:00
committed by GitHub
parent c47f55253f
commit 95b51669ad
27 changed files with 102 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application_controller.rb
View File

@ -618,18 +618,16 @@ class ApplicationController < ActionController::Base
end
def directory_columns_json
types = DirectoryColumn.types
DirectoryColumn
.left_joins(:user_field)
.where(enabled: true)
.order(:position)
.pluck('directory_columns.id',
'directory_columns.name',
'directory_columns.type',
.pluck('directory_columns.name',
'directory_columns.automatic',
'directory_columns.icon',
'user_fields.id',
'user_fields.name')
.map { |column| { id: column[0], name: column[1] || column[5], type: types.key(column[2]), icon: column[3], user_field_id: column[4] } }
.map { |column| { name: column[0] || column[4], automatic: column[1], icon: column[2], user_field_id: column[3] } }
.to_json
end