From a576224d0ea0a6a48207002229ae38937bd038a3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 9 Dec 2015 00:32:53 -0500 Subject: [PATCH] unified name: IsViewBranch, IsViewCommit and IsViewTag --- conf/app.ini | 4 ++-- gogs.go | 2 +- modules/middleware/context.go | 6 +++--- modules/middleware/repo.go | 14 +++++++------- routers/repo/view.go | 3 --- templates/.VERSION | 2 +- templates/repo/home.tmpl | 4 ++-- templates/repo/view_file.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index ab8bd9f566..d086eb7014 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -265,8 +265,8 @@ ADDR = ; For "smtp" mode only [log.smtp] LEVEL = -; Name displayed in mail title, default is "Diagnostic message from serve" -SUBJECT = Diagnostic message from serve +; Name displayed in mail title, default is "Diagnostic message from server" +SUBJECT = Diagnostic message from server ; Mail server HOST = ; Mailer user name and password diff --git a/gogs.go b/gogs.go index bae977212a..f4e8697b38 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.7.35.1208 Beta" +const APP_VER = "0.7.35.1209 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) 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 { diff --git a/routers/repo/view.go b/routers/repo/view.go index 98b44f42e3..361d77a85a 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -53,9 +53,6 @@ func Home(ctx *middleware.Context) { treeLink += "/" + treename } - isViewBranch := ctx.Repo.IsBranch - ctx.Data["IsViewBranch"] = isViewBranch - treePath := treename if len(treePath) != 0 { treePath = treePath + "/" diff --git a/templates/.VERSION b/templates/.VERSION index d8afdb4079..33860edec4 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.35.1208 Beta \ No newline at end of file +0.7.35.1209 Beta \ No newline at end of file diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 12820e46b3..ccbe6639cf 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -39,14 +39,14 @@ - + {{.i18n.Tr "repo.tags"}} -