From 84ed5bb06c44336260e758619e3300b325b15fc5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 15 May 2020 17:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9fork=5Fuser.json.jbuilder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/fork_users.json.jbuilder | 2 +- app/views/projects/watch_users.json.jbuilder | 4 ++-- db/migrate/20200515082628_create_fork_users.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/projects/fork_users.json.jbuilder b/app/views/projects/fork_users.json.jbuilder index b08eafdaf..f2ea0adae 100644 --- a/app/views/projects/fork_users.json.jbuilder +++ b/app/views/projects/fork_users.json.jbuilder @@ -2,7 +2,7 @@ json.count @fork_users.size json.fork_users do json.array! @fork_users.each do |f| user = f.user - fork_project = Project.select(:id,).find_by(f.fork_project_id) + fork_project = Project.select(:id,:fork_project_id,:name).find_by(id: f.fork_project_id) json.id f.fork_project_id json.name "#{user.try(:show_real_name)}/#{fork_project.name}" json.login user.try(:login) diff --git a/app/views/projects/watch_users.json.jbuilder b/app/views/projects/watch_users.json.jbuilder index af65c9c97..185aea6e3 100644 --- a/app/views/projects/watch_users.json.jbuilder +++ b/app/views/projects/watch_users.json.jbuilder @@ -1,4 +1,4 @@ -json.cout @watch_users.size +json.cout @watchers.size json.watchers do - json.partial! "/projects/list_user", collection: @watch_user, as: :target + json.partial! "/projects/list_user", collection: @watchers, as: :target end \ No newline at end of file diff --git a/db/migrate/20200515082628_create_fork_users.rb b/db/migrate/20200515082628_create_fork_users.rb index 9900095d0..476c67ed6 100644 --- a/db/migrate/20200515082628_create_fork_users.rb +++ b/db/migrate/20200515082628_create_fork_users.rb @@ -9,7 +9,7 @@ class CreateForkUsers < ActiveRecord::Migration[5.2] add_index :fork_users, :project_id add_index :fork_users, :user_id - projects = Project.where.not(forked_from_project_id: [nil, ""]) + projects = Project.where("forked_from_project_id is not null") projects.each do |p| ForkUser.create(project_id: p.forked_from_project_id, fork_project_id: p.id, user_id: p.user_id) end