From 147b8573ea74958154a7f0ed58e2a8d16266fbb3 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 21 Apr 2020 11:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_my_query.rb | 4 ++-- app/views/users/projects.json.jbuilder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 78a310f58..23d3bc7d4 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -11,11 +11,11 @@ class Projects::ListMyQuery < ApplicationQuery def call if params[:category].blank? - projects = current_user.projects + projects = Project.joins(:members).where(members: { user_id: current_user.id }) elsif params[:category].to_s == "manage" projects = Project.where(user_id: current_user.id) else - projects = Project.where.not(user_id: current_user.id).joins(:members).where("members.user_id = ?", current_user.id) + projects = Project.where.not(user_id: current_user.id).joins(:members).where(members: { user_id: current_user.id }) end scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension).like(params[:search]) .with_project_type(params[:project_type]) diff --git a/app/views/users/projects.json.jbuilder b/app/views/users/projects.json.jbuilder index 46e25ae83..b761b96dc 100644 --- a/app/views/users/projects.json.jbuilder +++ b/app/views/users/projects.json.jbuilder @@ -12,7 +12,7 @@ json.projects do json.is_public project.is_public json.owner do json.real_name user.present? ? user.try(:real_name) : "未知用户" - json.avatar_url user.present? ? url_to_avatar(user) : "images/avatars/User/b" + json.avatar_url user.present? ? url_to_avatar(user) : "avatars/User/b" # json.school_name user.school_name end json.category do