Browse Source

Fix commit status icon when in subdirectory (#20285)

When viewing a subdirectory and the latest commit to that directory in
the table, the commit status icon incorrectly showed the status of the
HEAD commit instead of the latest for that directory.
tags/v1.18.0-rc0
silverwind 1 year ago
parent
commit
7d20c8323a
No account linked to committer's email address
3 changed files with 9 additions and 7 deletions
  1. 1
    0
      models/migrations/v219.go
  2. 1
    0
      modules/git/git.go
  3. 7
    7
      routers/web/repo/view.go

+ 1
- 0
models/migrations/v219.go View File

@@ -9,6 +9,7 @@ import (

"code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/timeutil"

"xorm.io/xorm"
)


+ 1
- 0
modules/git/git.go View File

@@ -20,6 +20,7 @@ import (

"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

"github.com/hashicorp/go-version"
)


+ 7
- 7
routers/web/repo/view.go View File

@@ -854,15 +854,15 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
}
ctx.Data["LatestCommitVerification"] = verification
ctx.Data["LatestCommitUser"] = user_model.ValidateCommitWithEmail(latestCommit)
}

statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, ctx.Repo.Commit.ID.String(), db.ListOptions{})
if err != nil {
log.Error("GetLatestCommitStatus: %v", err)
}
statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, latestCommit.ID.String(), db.ListOptions{})
if err != nil {
log.Error("GetLatestCommitStatus: %v", err)
}

ctx.Data["LatestCommitStatus"] = git_model.CalcCommitStatus(statuses)
ctx.Data["LatestCommitStatuses"] = statuses
ctx.Data["LatestCommitStatus"] = git_model.CalcCommitStatus(statuses)
ctx.Data["LatestCommitStatuses"] = statuses
}

branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
treeLink := branchLink

Loading…
Cancel
Save