Browse Source

add: pullrequest admin or developer

tags/v3.1.5
yystopf 4 years ago
parent
commit
7d26fba3c0
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      app/controllers/pull_requests_controller.rb
  2. +1
    -0
      app/views/pull_requests/index.json.jbuilder

+ 1
- 0
app/controllers/pull_requests_controller.rb View File

@@ -19,6 +19,7 @@ class PullRequestsController < ApplicationController
@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})
@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")
@issues_size = scopes.size


+ 1
- 0
app/views/pull_requests/index.json.jbuilder View File

@@ -5,6 +5,7 @@ json.merged_issues_size @merged_issues.size
json.search_count @issues_size
json.limit @limit
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_author_name @project.owner.try(:login)



Loading…
Cancel
Save