From 3bf89f2f4ae23ac2512568923a4b097f41c9e051 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 15 Nov 2023 11:58:59 +0100 Subject: [PATCH 1/3] Add edit option for README.md --- routers/web/repo/view.go | 10 ++++++++++ templates/repo/view_file.tmpl | 3 +++ 2 files changed, 13 insertions(+) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 89bb1839e1747..8c57317bc3a7c 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -331,6 +331,16 @@ func renderReadmeFile(ctx *context.Context, subfolder string, readmeFile *git.Tr ctx.Data["FileContent"] = buf.String() } + + lfsLock, err := git_model.GetTreePathLock(ctx, ctx.Repo.Repository.ID, path.Join(ctx.Repo.TreePath, readmeFile.Name())) + if err != nil { + ctx.ServerError("GetTreePathLock", err) + return + } + + if !fInfo.isLFSFile && ctx.Repo.CanEnableEditor(ctx, ctx.Doer) && (lfsLock == nil || lfsLock.OwnerID == ctx.Doer.ID) { + ctx.Data["CanEditReadmeFile"] = true + } } func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) { diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 53e889fefc3a6..b7e5a2ffd7d7c 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -61,6 +61,9 @@ {{end}} + {{if and .ReadmeInList .CanEditReadmeFile}} + {{svg "octicon-pencil"}} + {{end}}
From 49265641354bbaf83d061b2f7a84c94082986739 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 15 Nov 2023 14:43:04 +0100 Subject: [PATCH 2/3] Remove span --- templates/repo/view_file.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index b7e5a2ffd7d7c..983491f97d77d 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -62,7 +62,7 @@ {{end}} {{if and .ReadmeInList .CanEditReadmeFile}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}}
From d8372af6843d4566bcd248dc6260b48f18c503fa Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 20 Nov 2023 10:18:45 +0100 Subject: [PATCH 3/3] Remove lfsLock Check --- routers/web/repo/view.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 8c57317bc3a7c..ba2ac3af115e4 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -332,13 +332,7 @@ func renderReadmeFile(ctx *context.Context, subfolder string, readmeFile *git.Tr ctx.Data["FileContent"] = buf.String() } - lfsLock, err := git_model.GetTreePathLock(ctx, ctx.Repo.Repository.ID, path.Join(ctx.Repo.TreePath, readmeFile.Name())) - if err != nil { - ctx.ServerError("GetTreePathLock", err) - return - } - - if !fInfo.isLFSFile && ctx.Repo.CanEnableEditor(ctx, ctx.Doer) && (lfsLock == nil || lfsLock.OwnerID == ctx.Doer.ID) { + if !fInfo.isLFSFile && ctx.Repo.CanEnableEditor(ctx, ctx.Doer) { ctx.Data["CanEditReadmeFile"] = true } }