From b68c9945e54f34f3bcf45a474d2131555749a337 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Tue, 27 Apr 2021 14:40:18 +0800 Subject: [PATCH] add: project edit transfer --- app/views/repositories/edit.json.jbuilder | 5 ++++- app/views/users/_user_simple.json.jbuilder | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/views/repositories/edit.json.jbuilder b/app/views/repositories/edit.json.jbuilder index d268696cc..7a11411f4 100644 --- a/app/views/repositories/edit.json.jbuilder +++ b/app/views/repositories/edit.json.jbuilder @@ -9,4 +9,7 @@ json.website @project.website json.project_units @project.project_units.pluck(:unit_type) json.lesson_url @project.lesson_url json.permission render_permission(current_user, @project) -json.is_transfering @project.is_transfering \ No newline at end of file +json.is_transfering @project.is_transfering +json.transfer do + json.partial! "/users/user_simple", locals: {user: @project&.applied_transfer_project&.owner} +end \ No newline at end of file diff --git a/app/views/users/_user_simple.json.jbuilder b/app/views/users/_user_simple.json.jbuilder index cfd06a405..5da161509 100644 --- a/app/views/users/_user_simple.json.jbuilder +++ b/app/views/users/_user_simple.json.jbuilder @@ -1,5 +1,9 @@ -json.id user.id -json.type user.type -json.name user.real_name -json.login user.login -json.image_url url_to_avatar(user) \ No newline at end of file +if user.present? + json.id user.id + json.type user.type + json.name user.real_name + json.login user.login + json.image_url url_to_avatar(user) +else + json.nil! +end \ No newline at end of file