diff --git a/app/views/owners/show.json.jbuilder b/app/views/owners/show.json.jbuilder index db0a80854..657183eb1 100644 --- a/app/views/owners/show.json.jbuilder +++ b/app/views/owners/show.json.jbuilder @@ -1,10 +1,10 @@ -json.type @owner.type -if @owner.is_a?(Organization) +json.type @owner.present? ? @owner.type : 'User' +if @owner.present? && @owner.is_a?(Organization) json.partial! "organizations/organizations/detail", organization: @owner json.can_create_project @can_create_project json.is_admin @is_admin json.is_member @is_member -elsif @owner.is_a?(User) +elsif @owner.present? && @owner.is_a?(User) json.partial! 'users/user', locals: { user: @owner } json.undo_messages @waiting_applied_messages.size json.undo_transfer_projects @common_applied_transfer_projects.size @@ -21,6 +21,6 @@ elsif @owner.is_a?(User) json.city @owner.show_location ? @owner.city : nil json.custom_department @owner.show_department ? @owner.custom_department : nil json.description @owner.description -elsif +else json.nil end \ No newline at end of file