add: pullrequest admin or developer
This commit is contained in:
parent
5637001b16
commit
7d26fba3c0
|
@ -19,6 +19,7 @@ class PullRequestsController < ApplicationController
|
||||||
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
|
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
|
||||||
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
|
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
|
||||||
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
|
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
|
||||||
|
@user_admin_or_developer = current_user.present? && (current_user.admin || @project.all_developers.include?(current_user))
|
||||||
|
|
||||||
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
|
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
|
||||||
@issues_size = scopes.size
|
@issues_size = scopes.size
|
||||||
|
|
|
@ -5,6 +5,7 @@ json.merged_issues_size @merged_issues.size
|
||||||
json.search_count @issues_size
|
json.search_count @issues_size
|
||||||
json.limit @limit
|
json.limit @limit
|
||||||
json.user_admin_or_member @user_admin_or_member
|
json.user_admin_or_member @user_admin_or_member
|
||||||
|
json.user_admin_or_developer @user_admin_or_developer
|
||||||
json.project_name @project.name
|
json.project_name @project.name
|
||||||
json.project_author_name @project.owner.try(:login)
|
json.project_author_name @project.owner.try(:login)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue