diff options
| author | Unknwon <u@gogs.io> | 2015-12-09 00:32:53 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-09 00:32:53 -0500 |
| commit | a576224d0ea0a6a48207002229ae38937bd038a3 (patch) | |
| tree | 479bb167651a1301ca71b7175078c1e1be1336c0 /modules | |
| parent | 989f30eb416f2d8709aaff9c235d555f8b109e36 (diff) | |
| download | gitea-a576224d0ea0a6a48207002229ae38937bd038a3.tar.gz gitea-a576224d0ea0a6a48207002229ae38937bd038a3.zip | |
unified name: IsViewBranch, IsViewCommit and IsViewTag
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/middleware/context.go | 6 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 7528e2a7a4..5784d756b2 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -29,9 +29,9 @@ import ( type RepoContext struct { AccessMode models.AccessMode IsWatching bool - IsBranch bool - IsTag bool - IsCommit bool + IsViewBranch bool + IsViewTag bool + IsViewCommit bool Repository *models.Repository Owner *models.User Commit *git.Commit diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index c52c162f0d..5a9ee0c0d1 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -263,7 +263,7 @@ func RepoRef() macaron.Handler { return } ctx.Repo.CommitID = ctx.Repo.Commit.ID.String() - ctx.Repo.IsBranch = true + ctx.Repo.IsViewBranch = true } else { hasMatched := false @@ -286,7 +286,7 @@ func RepoRef() macaron.Handler { } if ctx.Repo.GitRepo.IsBranchExist(refName) { - ctx.Repo.IsBranch = true + ctx.Repo.IsViewBranch = true ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommitOfBranch(refName) if err != nil { @@ -296,7 +296,7 @@ func RepoRef() macaron.Handler { ctx.Repo.CommitID = ctx.Repo.Commit.ID.String() } else if ctx.Repo.GitRepo.IsTagExist(refName) { - ctx.Repo.IsTag = true + ctx.Repo.IsViewTag = true ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommitOfTag(refName) if err != nil { ctx.Handle(500, "GetCommitOfTag", err) @@ -304,7 +304,7 @@ func RepoRef() macaron.Handler { } ctx.Repo.CommitID = ctx.Repo.Commit.ID.String() } else if len(refName) == 40 { - ctx.Repo.IsCommit = true + ctx.Repo.IsViewCommit = true ctx.Repo.CommitID = refName ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommit(refName) @@ -321,9 +321,9 @@ func RepoRef() macaron.Handler { ctx.Repo.BranchName = refName ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["CommitID"] = ctx.Repo.CommitID - ctx.Data["IsBranch"] = ctx.Repo.IsBranch - ctx.Data["IsTag"] = ctx.Repo.IsTag - ctx.Data["IsCommit"] = ctx.Repo.IsCommit + ctx.Data["IsViewBranch"] = ctx.Repo.IsViewBranch + ctx.Data["IsViewTag"] = ctx.Repo.IsViewTag + ctx.Data["IsViewCommit"] = ctx.Repo.IsViewCommit ctx.Repo.CommitsCount, err = ctx.Repo.Commit.CommitsCount() if err != nil { |