Load Repo Topics on blame view (#11307)

Fix #11280
go-gitea · May 5, 2020 · a1f11a0 · a1f11a0
1 parent d9de58b
commit a1f11a0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/routers/repo/blame.go b/routers/repo/blame.go
@@ -194,6 +194,12 @@ func RefBlame(ctx *context.Context) {
  commitNames[c.ID.String()] = c
  }
 
+ // Get Topics of this repo
+ renderRepoTopics(ctx)
+ if ctx.Written() {
+ return
+ }
+
  renderBlame(ctx, blameParts, commitNames)
 
  ctx.HTML(200, tplBlame)

diff --git a/routers/repo/view.go b/routers/repo/view.go
@@ -621,6 +621,17 @@ func renderLanguageStats(ctx *context.Context) {
  ctx.Data["LanguageStats"] = langs
 }
 
+func renderRepoTopics(ctx *context.Context) {
+ topics, err := models.FindTopics(&models.FindTopicOptions{
+ RepoID: ctx.Repo.Repository.ID,
+ })
+ if err != nil {
+ ctx.ServerError("models.FindTopics", err)
+ return
+ }
+ ctx.Data["Topics"] = topics
+}
+
 func renderCode(ctx *context.Context) {
  ctx.Data["PageIsViewCode"] = true
 
@@ -645,14 +656,10 @@ func renderCode(ctx *context.Context) {
  }
 
  // Get Topics of this repo
- topics, err := models.FindTopics(&models.FindTopicOptions{
- RepoID: ctx.Repo.Repository.ID,
- })
- if err != nil {
- ctx.ServerError("models.FindTopics", err)
+ renderRepoTopics(ctx)
+ if ctx.Written() {
  return
  }
- ctx.Data["Topics"] = topics
 
  // Get current entry user currently looking at.
  entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)