yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]

This commit is contained in:
viletyy 2021-01-11 18:43:22 +08:00
parent fbf22ff0df
commit 4693e77e02
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/projects_helper.rb
View File

@ -52,6 +52,7 @@ module ProjectsHelper
type: project.numerical_for_project_type, type: project.numerical_for_project_type,
author: render_owner(project), author: render_owner(project),
is_secret: project.is_secret, 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}} user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}}
}).compact }).compact

2
app/queries/projects/list_my_query.rb
View File

@ -49,7 +49,7 @@ class Projects::ListMyQuery < ApplicationQuery
q = projects.ransack(name_or_identifier_cont: params[:search]) 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 = params[:sort_by] || "updated_on"
sort_direction = params[:sort_direction] || "desc" sort_direction = params[:sort_direction] || "desc"

2
app/views/projects/_project_detail.json.jbuilder
View File

@ -53,7 +53,7 @@ json.category do
end end
end 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) user_apply_signatures = project.apply_signatures.with_user_id(current_user.id)
json.user_apply_signatures user_apply_signatures do |signature| json.user_apply_signatures user_apply_signatures do |signature|
json.id signature.id json.id signature.id