floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'FIX WIP' (#192) from dev_trustie_server into trustie_server

This commit is contained in:
jasder 2021-10-14 18:13:26 +08:00
parent 01377bc20a 7030e0b5bc
commit 5cbe83f9d4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/pull_requests_controller.rb
View File

@ -69,9 +69,9 @@ class PullRequestsController < ApplicationController
end end
def edit def edit
@fork_project_user_name = @project&.fork_project&.owner.try(:show_real_name) @fork_project_user_name = @pull_request&.fork_project&.owner.try(:show_real_name)
@fork_project_user = @project&.fork_project&.owner.try(:login) @fork_project_user = @pull_request&.fork_project&.owner.try(:login)
@fork_project_identifier = @project&.fork_project&.repository.try(:identifier) @fork_project_identifier = @pull_request&.fork_project&.repository.try(:identifier)
end end
def update def update

4
app/views/pull_requests/show.json.jbuilder
View File

@ -3,8 +3,8 @@ json.project_name @project.name
json.identifier @project.identifier json.identifier @project.identifier
json.project_identifier @project.identifier json.project_identifier @project.identifier
json.pr_time time_from_now(@pull_request.updated_at) json.pr_time time_from_now(@pull_request.updated_at)
json.commits_count @pull_request.commits_count json.commits_count @gitea_pull["commit_num"]
json.files_count @pull_request.files_count json.files_count @gitea_pull["changed_files"]
json.comments_count @issue.journals.parent_journals.size json.comments_count @issue.journals.parent_journals.size
json.comments_total_count @issue.get_journals_size json.comments_total_count @issue.get_journals_size