From 939f33a8a2a96abc1c3e8f09b274145f3eeb1bf2 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Mon, 9 Nov 2020 17:23:19 +0800 Subject: [PATCH] FIX sha value bug --- app/controllers/repositories_controller.rb | 5 +++-- app/views/repositories/commit.json.jbuilder | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e44f4f24b..fb2c2e5e9 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -82,8 +82,9 @@ class RepositoriesController < ApplicationController end def commit - @commit = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, params[:sha], current_user.gitea_token) - @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, params[:sha], current_user.gitea_token, {diff: true}) + @sha = params[:sha] + @commit = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user.gitea_token) + @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user.gitea_token, {diff: true}) end def tags diff --git a/app/views/repositories/commit.json.jbuilder b/app/views/repositories/commit.json.jbuilder index af5b3192b..77f6e3f1b 100644 --- a/app/views/repositories/commit.json.jbuilder +++ b/app/views/repositories/commit.json.jbuilder @@ -2,7 +2,7 @@ json.files_count @commit_diff['NumFiles'] json.total_addition @commit_diff['TotalAddition'] json.total_deletion @commit_diff['TotalDeletion'] -json.files @commit_diff['Files'], partial: 'pull_requests/diff_file', as: :file, locals: {sha: ""} +json.files @commit_diff['Files'], partial: 'pull_requests/diff_file', as: :file, locals: {sha: @sha} json.partial! 'commit', commit: @commit, project: @project json.parents @commit['parents'] do |parent|