From 8f6b455a95c9eed8fc40c7171bbafb9ef3180852 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 3 Jul 2020 17:00:55 +0800 Subject: [PATCH] change pr codes --- app/controllers/pull_requests_controller.rb | 1 - app/models/project.rb | 2 +- app/views/pull_requests/show.json.jbuilder | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index d32b934fe..f17382c2d 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -174,7 +174,6 @@ class PullRequestsController < ApplicationController end def show - @user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || @project.user_id == current_user.id || @project.manager?(current_user) ) @issue_user = @issue.user @issue_assign_to = @issue.get_assign_user diff --git a/app/models/project.rb b/app/models/project.rb index e70c932bd..65579dae3 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -47,7 +47,7 @@ class Project < ApplicationRecord end def members_user_infos - members.joins("left join users on members.user_id = users.id").includes(:user).where("users.type = ?", "User") + members.joins(:roles).where("roles.name in ('Manager', 'Developer')").joins("left join users on members.user_id = users.id ").includes(:user).where("users.type = ?", "User") # members.joins("left join users on members.user_id = users.id").select("users.id", "users.login","users.firstname","users.lastname") # .pluck("users.id", "users.login","users.lastname", "users.firstname") end diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 0c497d6c7..b525d5438 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -11,7 +11,7 @@ end json.issue do json.extract! @issue, :id,:subject,:description,:is_private, :branch_name json.project_author_name @project.owner.try(:login) - json.user_permission @user_permission + #json.user_permission @user_permission json.closed_on @issue.closed_on.present? ? format_time(@issue.closed_on) : "" json.created_at format_time(@issue.created_on) json.assign_user_name @issue_assign_to.try(:show_real_name)