From 27ec7ec7dd9fd517521935a1023a67d49782359c Mon Sep 17 00:00:00 2001 From: viletyy Date: Mon, 28 Dec 2020 18:41:28 +0800 Subject: [PATCH] =?UTF-8?q?[ADD]simple=E5=8E=BB=E9=99=A4=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E5=B9=B6=E5=8A=A0=E5=85=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 4 +++- app/models/concerns/project_ability.rb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c00010b2..6eeaa8fa 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -50,7 +50,9 @@ module ProjectsHelper repo_id: repo.id, open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?, type: project.numerical_for_project_type, - author: render_owner(project) + author: render_owner(project), + is_secret: project.is_secret, + user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}} }).compact render json: tmp_json diff --git a/app/models/concerns/project_ability.rb b/app/models/concerns/project_ability.rb index 682f6fdc..48e5cc61 100644 --- a/app/models/concerns/project_ability.rb +++ b/app/models/concerns/project_ability.rb @@ -7,6 +7,7 @@ module ProjectAbility def can_read_project?(project) return true if self.admin? + return true if project.is_secret return false if !project.is_public? && !project.member?(self.id) true end