summaryrefslogtreecommitdiffstats
path: root/templates/repo
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2022-09-17 04:45:32 +0200
committerGitHub <noreply@github.com>2022-09-17 10:45:32 +0800
commit43c10def6849f0e1ea50a52115360e6be50ad1ab (patch)
tree1ed22403fea8eed5f15461398a51001c1587bf88 /templates/repo
parent548387b2beaaaeb6b1c32c3c6f226b8f53aafecb (diff)
downloadgitea-43c10def6849f0e1ea50a52115360e6be50ad1ab.tar.gz
gitea-43c10def6849f0e1ea50a52115360e6be50ad1ab.zip
Fix CSV diff for added/deleted files (#21189)
Fixes #21184 Regression of #19552 Instead of using `GetBlobByPath` I use the already existing instances. We need more information from #19530 if that error is still present.
Diffstat (limited to 'templates/repo')
-rw-r--r--templates/repo/diff/box.tmpl2
-rw-r--r--templates/repo/diff/csv_diff.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 35b8b3956d..06bc79e97a 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -153,7 +153,7 @@
{{if $isImage}}
{{template "repo/diff/image_diff" dict "file" . "root" $ "blobBase" $blobBase "blobHead" $blobHead}}
{{else}}
- {{template "repo/diff/csv_diff" dict "file" . "root" $}}
+ {{template "repo/diff/csv_diff" dict "file" . "root" $ "blobBase" $blobBase "blobHead" $blobHead}}
{{end}}
</table>
</div>
diff --git a/templates/repo/diff/csv_diff.tmpl b/templates/repo/diff/csv_diff.tmpl
index a92ef79301..0f46da306e 100644
--- a/templates/repo/diff/csv_diff.tmpl
+++ b/templates/repo/diff/csv_diff.tmpl
@@ -1,6 +1,6 @@
<tr>
<td>
- {{$result := call .root.CreateCsvDiff .file .root.BaseCommit .root.HeadCommit}}
+ {{$result := call .root.CreateCsvDiff .file .blobBase .blobHead}}
{{if $result.Error}}
<div class="ui center">{{$result.Error}}</div>
{{else if $result.Sections}}