From 31858a79e35360a792cea75f5bcbc4085d17d568 Mon Sep 17 00:00:00 2001
From: viletyy <yystopf@163.com>
Date: Fri, 15 Jan 2021 17:19:34 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E6=88=90=E5=91=98=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_user_detail.json.jbuilder        | 8 ++++++++
 .../organization_users/_detail.json.jbuilder              | 5 +++--
 app/views/organizations/team_users/_detail.json.jbuilder  | 5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 app/views/organizations/_user_detail.json.jbuilder

diff --git a/app/views/organizations/_user_detail.json.jbuilder b/app/views/organizations/_user_detail.json.jbuilder
new file mode 100644
index 000000000..0fa35215a
--- /dev/null
+++ b/app/views/organizations/_user_detail.json.jbuilder
@@ -0,0 +1,8 @@
+json.user_id user.id
+json.login user.login
+json.name user.full_name
+json.mail user.mail
+json.identity user.identity
+json.watched current_user.watched?(user)
+# json.email user.mail # 邮箱原则上不暴露的，如果实在需要的话只能对某些具体的接口公开
+json.image_url url_to_avatar(user)
diff --git a/app/views/organizations/organization_users/_detail.json.jbuilder b/app/views/organizations/organization_users/_detail.json.jbuilder
index 20696efcd..90426a61a 100644
--- a/app/views/organizations/organization_users/_detail.json.jbuilder
+++ b/app/views/organizations/organization_users/_detail.json.jbuilder
@@ -1,6 +1,7 @@
 json.id org_user.id
 json.user do
-  json.partial! "/users/user", user: org_user.user
+  json.partial! "organizations/user_detail", user: org_user.user
 end
 
-json.team_names org_user.teams.pluck(:name)
\ No newline at end of file
+json.team_names org_user.teams.pluck(:name)
+json.created_at org_user.created_at.strftime("%Y-%m-%d")
\ No newline at end of file
diff --git a/app/views/organizations/team_users/_detail.json.jbuilder b/app/views/organizations/team_users/_detail.json.jbuilder
index c6c93e779..6bb6bf78a 100644
--- a/app/views/organizations/team_users/_detail.json.jbuilder
+++ b/app/views/organizations/team_users/_detail.json.jbuilder
@@ -1,4 +1,5 @@
 json.id team_user.id
 json.user do
-  json.partial! "/users/user", user: team_user.user
-end
\ No newline at end of file
+  json.partial! "organizations/user_detail", user: team_user.user
+end
+json.created_at team_user.created_at.strftime("%Y-%m-%d")
\ No newline at end of file