change pr codes
This commit is contained in:
parent
385abd53b7
commit
8f6b455a95
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue