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