From 98190d0024b32c946454792c8094435e96c08d70 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 8 Aug 2022 21:42:36 +0800 Subject: [PATCH] Fix disable download button (#20701) --- modules/context/context.go | 2 +- templates/repo/branch/list.tmpl | 2 +- templates/repo/home.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/context/context.go b/modules/context/context.go index 882491161..0b9898ace 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -224,7 +224,7 @@ func (ctx *Context) HTML(status int, name base.TplName) { ctx.Data["TemplateLoadTimes"] = func() string { return strconv.FormatInt(time.Since(tmplStartTime).Nanoseconds()/1e6, 10) + "ms" } - if err := ctx.Render.HTML(ctx.Resp, status, string(name), ctx.Data); err != nil { + if err := ctx.Render.HTML(ctx.Resp, status, string(name), templates.BaseVars().Merge(ctx.Data)); err != nil { if status == http.StatusInternalServerError && name == base.TplName("status/500") { ctx.PlainText(http.StatusInternalServerError, "Unable to find status/500 template") return diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 4a85692a8..09799fbec 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -112,7 +112,7 @@ {{svg "octicon-git-branch"}} {{end}} - {{if (not .IsDeleted)}} + {{if and (not .IsDeleted) (not $.DisableDownloadSourceArchives)}}