From fbf22ff0df922f81be24e4d7cafbf2a366cf73b4 Mon Sep 17 00:00:00 2001 From: viletyy Date: Mon, 11 Jan 2021 17:52:58 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E6=88=90=E5=91=98=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/views/projects/index.json.jbuilder | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c2486949..ec182f5e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,7 +11,7 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params) # @projects = kaminari_paginate(scope) - @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, owner: :user_extension) + @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, :members, owner: :user_extension) category_id = params[:category_id] @total_count = diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index ff4b44c9..2c02616d 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -48,6 +48,7 @@ json.projects @projects do |project| json.name project.project_language.name end end + json.is_member !project.members.where(user_id: current_user.id).blank? user_apply_signatures = project.apply_signatures.with_user_id(current_user.id) json.user_apply_signatures user_apply_signatures do |signature| json.id signature.id