From fbf2738bd16aea26fb7145fdfa740bf491d79a39 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 5 Jun 2020 18:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9watcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 2 +- app/views/users/_watch_user_detail.json.jbuilder | 2 +- app/views/users/fan_users.json.jbuilder | 5 ++++- app/views/users/watch_users.json.jbuilder | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index a75172328..f919ed1bf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -71,7 +71,7 @@ class User < ApplicationRecord has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注 has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户 - has_many :watchers, dependent: :destroy + has_many :watchers, as: :watchable, dependent: :destroy # 认证 has_many :apply_user_authentication diff --git a/app/views/users/_watch_user_detail.json.jbuilder b/app/views/users/_watch_user_detail.json.jbuilder index 5f292f720..847164dcc 100644 --- a/app/views/users/_watch_user_detail.json.jbuilder +++ b/app/views/users/_watch_user_detail.json.jbuilder @@ -1,4 +1,4 @@ -user = target.watchable +# user = target.watchable json.format_time target.created_at.strftime("%Y-%m-%d") json.name user.try(:show_real_name) diff --git a/app/views/users/fan_users.json.jbuilder b/app/views/users/fan_users.json.jbuilder index b23006d6a..ca097b6fe 100644 --- a/app/views/users/fan_users.json.jbuilder +++ b/app/views/users/fan_users.json.jbuilder @@ -1,4 +1,7 @@ json.count @watchers_count json.users do - json.partial! "/users/watch_user_detail", collection: @watchers, as: :target + json.array! @watchers do |watcher| + json.partial! "/users/watch_user_detail", locals: {target: watcher, user: target.user} + end + # json.partial! "/users/watch_user_detail", collection: @watchers, as: :target end \ No newline at end of file diff --git a/app/views/users/watch_users.json.jbuilder b/app/views/users/watch_users.json.jbuilder index b23006d6a..b265e2e0a 100644 --- a/app/views/users/watch_users.json.jbuilder +++ b/app/views/users/watch_users.json.jbuilder @@ -1,4 +1,7 @@ json.count @watchers_count json.users do - json.partial! "/users/watch_user_detail", collection: @watchers, as: :target + json.array! @watchers do |watcher| + json.partial! "/users/watch_user_detail", locals: {target: watcher, user: watcher.watchable} + end + # json.partial! "/users/watch_user_detail", collection: @watchers, as: :target end \ No newline at end of file