floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-07 21:51:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'FIX some bug' (#128) from develop into dev_trustie_server

Browse Source
This commit is contained in:
jasder
2021-08-27 15:12:27 +08:00
parent 299e8534d1 b9bf3fb5ff
commit 0f57844106
17 changed files with 91 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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