core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show .editorconfig errors in frontend (#21088) 

If the user views the .editorconfig of the Repo, an the the
.editorconfig contains error, those errors are now shown above the file.
This commit is contained in:
JakobDev 2022-09-12 00:16:56 +02:00 committed by GitHub
parent ec82a24547
commit 23fbf5e1ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
routers/web/repo/view.go
View File

@ -374,6 +374,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["FileName"] = blob.Name() ctx.Data["FileName"] = blob.Name()
ctx.Data["RawFileLink"] = rawLink + "/" + util.PathEscapeSegments(ctx.Repo.TreePath) ctx.Data["RawFileLink"] = rawLink + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
if ctx.Repo.TreePath == ".editorconfig" {
_, editorconfigErr := ctx.Repo.GetEditorconfig()
ctx.Data["FileError"] = editorconfigErr
}
buf := make([]byte, 1024) buf := make([]byte, 1024)
n, _ := util.ReadAtMost(dataRc, buf) n, _ := util.ReadAtMost(dataRc, buf)
buf = buf[:n] buf = buf[:n]

7
templates/repo/view_file.tmpl
View File

@ -1,4 +1,11 @@
<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content"> <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
{{- if .FileError}}
<div class="ui warning message">
<div class="text left">
<div>{{.FileError}}</div>
</div>
</div>
{{end}}
<h4 class="file-header ui top attached header df ac sb"> <h4 class="file-header ui top attached header df ac sb">
<div class="file-header-left df ac pr-4"> <div class="file-header-left df ac pr-4">
{{if .ReadmeInList}} {{if .ReadmeInList}}