diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 6eeaa8fa..a115acef 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -52,6 +52,7 @@ module ProjectsHelper type: project.numerical_for_project_type, author: render_owner(project), is_secret: project.is_secret, + is_member: !project.members.where(user_id: user.id).blank?, user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}} }).compact diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index ba521e90..879267b2 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -49,7 +49,7 @@ class Projects::ListMyQuery < ApplicationQuery q = projects.ransack(name_or_identifier_cont: params[:search]) - scope = q.result.includes(:project_category, :project_language,:owner, :repository) + scope = q.result.includes(:project_category, :project_language,:owner, :repository, :members) sort = params[:sort_by] || "updated_on" sort_direction = params[:sort_direction] || "desc" diff --git a/app/views/projects/_project_detail.json.jbuilder b/app/views/projects/_project_detail.json.jbuilder index d0fb16e2..2ad214d6 100644 --- a/app/views/projects/_project_detail.json.jbuilder +++ b/app/views/projects/_project_detail.json.jbuilder @@ -53,7 +53,7 @@ json.category do end 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