Use UserSerializer instead of `User.to_json`
This commit is contained in:
parent
6f1df8dfaa
commit
2f92238a6e
|
@ -8,12 +8,12 @@ class AutocompleteController < ApplicationController
|
||||||
def users
|
def users
|
||||||
@users = AutocompleteUsersFinder.new(params: params, current_user: current_user, project: @project, group: @group).execute
|
@users = AutocompleteUsersFinder.new(params: params, current_user: current_user, project: @project, group: @group).execute
|
||||||
|
|
||||||
render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
|
render json: UserSerializer.new.represent(@users)
|
||||||
end
|
end
|
||||||
|
|
||||||
def user
|
def user
|
||||||
@user = User.find(params[:id])
|
@user = User.find(params[:id])
|
||||||
render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
|
render json: UserSerializer.new.represent(@user)
|
||||||
end
|
end
|
||||||
|
|
||||||
def projects
|
def projects
|
||||||
|
|
|
@ -35,7 +35,7 @@ module FormHelper
|
||||||
multi_select: true,
|
multi_select: true,
|
||||||
'input-meta': 'name',
|
'input-meta': 'name',
|
||||||
'always-show-selectbox': true,
|
'always-show-selectbox': true,
|
||||||
current_user_info: current_user.to_json(only: [:id, :name])
|
current_user_info: UserSerializer.new.represent(current_user)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -362,7 +362,7 @@ module IssuablesHelper
|
||||||
moveIssueEndpoint: move_namespace_project_issue_path(namespace_id: issuable.project.namespace.to_param, project_id: issuable.project, id: issuable),
|
moveIssueEndpoint: move_namespace_project_issue_path(namespace_id: issuable.project.namespace.to_param, project_id: issuable.project, id: issuable),
|
||||||
projectsAutocompleteEndpoint: autocomplete_projects_path(project_id: @project.id),
|
projectsAutocompleteEndpoint: autocomplete_projects_path(project_id: @project.id),
|
||||||
editable: can_edit_issuable,
|
editable: can_edit_issuable,
|
||||||
currentUser: current_user.as_json(only: [:username, :id, :name], methods: :avatar_url),
|
currentUser: UserSerializer.new.represent(current_user),
|
||||||
rootPath: root_path,
|
rootPath: root_path,
|
||||||
fullPath: @project.full_path
|
fullPath: @project.full_path
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,7 +139,7 @@ module SearchHelper
|
||||||
id: "filtered-search-#{type}",
|
id: "filtered-search-#{type}",
|
||||||
placeholder: 'Search or filter results...',
|
placeholder: 'Search or filter results...',
|
||||||
data: {
|
data: {
|
||||||
'username-params' => @users.to_json(only: [:id, :username])
|
'username-params' => UserSerializer.new.represent(@users)
|
||||||
},
|
},
|
||||||
autocomplete: 'off'
|
autocomplete: 'off'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
%board-sidebar{ "inline-template" => true,
|
%board-sidebar{ "inline-template" => true, ":current-user" => (UserSerializer.new.represent(current_user) || {}).to_json }
|
||||||
":current-user" => "#{current_user ? current_user.to_json(only: [:username, :id, :name], methods: [:avatar_url]) : {}}" }
|
|
||||||
%transition{ name: "boards-sidebar-slide" }
|
%transition{ name: "boards-sidebar-slide" }
|
||||||
%aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" }
|
%aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" }
|
||||||
.issuable-sidebar
|
.issuable-sidebar
|
||||||
|
|
Loading…
Reference in New Issue