From f95b4ad982e3c4ba12b749924c47d6e81ff3b853 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 21 Apr 2020 10:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queries/projects/list_my_query.rb  |  2 +-
 app/views/users/projects.json.jbuilder | 32 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb
index 07c6b4359..56fcdae1d 100644
--- a/app/queries/projects/list_my_query.rb
+++ b/app/queries/projects/list_my_query.rb
@@ -17,7 +17,7 @@ class Projects::ListMyQuery < ApplicationQuery
       else
         projects = Project.where(user_id: params[:user_id])
       end
-      scope = projects.includes(:members,:issues,owner: :user_extension).like(params[:search])
+      scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension).like(params[:search])
                 .with_project_type(params[:project_type])
                 .with_project_category(params[:category_id])
                 .with_project_language(params[:language_id])
diff --git a/app/views/users/projects.json.jbuilder b/app/views/users/projects.json.jbuilder
index 3e472ff06..cd2da7eb7 100644
--- a/app/views/users/projects.json.jbuilder
+++ b/app/views/users/projects.json.jbuilder
@@ -16,21 +16,21 @@ json.projects do
       json.avatar_url url_to_avatar(user)
       json.school_name user.school_name
     end
-    # json.category do
-    #   if project.project_category.blank?
-    #     json.nil!
-    #   else
-    #     json.id project.project_category.id
-    #     json.name project.project_category.name
-    #   end
-    # end
-    # json.language do
-    #   if project.project_language.blank?
-    #     json.nil!
-    #   else
-    #     json.id project.project_language.id
-    #     json.name project.project_language.name
-    #   end
-    # end
+    json.category do
+      if project.project_category.blank?
+        json.nil!
+      else
+        json.id project.project_category.id
+        json.name project.project_category.name
+      end
+    end
+    json.language do
+      if project.project_language.blank?
+        json.nil!
+      else
+        json.id project.project_language.id
+        json.name project.project_language.name
+      end
+    end
   end
 end