From 9bf29c33573195ba0eb6568f9f619788b0e9a4e8 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 18 Jun 2025 07:39:18 +0800 Subject: [PATCH] fix --- routers/web/repo/view_readme.go | 4 ++-- templates/repo/view_file.tmpl | 2 +- web_src/js/features/comp/EditorUpload.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/web/repo/view_readme.go b/routers/web/repo/view_readme.go index 459cf0a616232..7af6ad450e402 100644 --- a/routers/web/repo/view_readme.go +++ b/routers/web/repo/view_readme.go @@ -150,7 +150,7 @@ func prepareToRenderReadmeFile(ctx *context.Context, subfolder string, readmeFil } ctx.Data["RawFileLink"] = "" - ctx.Data["ReadmeInList"] = true + ctx.Data["ReadmeInList"] = path.Join(subfolder, readmeFile.Name()) // the relative path to the readme file to the current tree path ctx.Data["ReadmeExist"] = true ctx.Data["FileIsSymlink"] = readmeFile.IsLink() @@ -162,7 +162,7 @@ func prepareToRenderReadmeFile(ctx *context.Context, subfolder string, readmeFil defer dataRc.Close() ctx.Data["FileIsText"] = fInfo.isTextFile - ctx.Data["FileTreePath"] = path.Join(subfolder, readmeFile.Name()) + ctx.Data["FileTreePath"] = path.Join(ctx.Repo.TreePath, subfolder, readmeFile.Name()) ctx.Data["FileSize"] = fInfo.fileSize ctx.Data["IsLFSFile"] = fInfo.isLFSFile diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index dc789a2648237..b49818c6b7c63 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -27,7 +27,7 @@
{{if .ReadmeInList}} {{svg "octicon-book" 16 "tw-mr-2"}} - {{.FileTreePath}} + {{.ReadmeInList}} {{else}} {{template "repo/file_info" .}} {{end}} diff --git a/web_src/js/features/comp/EditorUpload.ts b/web_src/js/features/comp/EditorUpload.ts index 3f6d26658daac..bf9ce9bfb10cd 100644 --- a/web_src/js/features/comp/EditorUpload.ts +++ b/web_src/js/features/comp/EditorUpload.ts @@ -135,7 +135,7 @@ function handleClipboardText(textarea: HTMLTextAreaElement, e: ClipboardEvent, p // when pasting links over selected text, turn it into [text](link) const pastedAsMarkdown = pasteAsMarkdownLink(textarea, pastedText); - if (pastedText) { + if (pastedAsMarkdown) { e.preventDefault(); replaceTextareaSelection(textarea, pastedAsMarkdown); }