From edb95faba2534d9bf53068b69db99ffa7b71938f Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Mon, 28 Aug 2017 17:06:10 +0300
Subject: [PATCH] Fix releases to be counted from database not tags (#2389)

---
 models/repo.go             |  2 +-
 modules/context/repo.go    | 10 +++++++++-
 templates/repo/header.tmpl |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/models/repo.go b/models/repo.go
index 47deba2da..81c9d4a11 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -194,7 +194,7 @@ type Repository struct {
 	NumMilestones       int `xorm:"NOT NULL DEFAULT 0"`
 	NumClosedMilestones int `xorm:"NOT NULL DEFAULT 0"`
 	NumOpenMilestones   int `xorm:"-"`
-	NumTags             int `xorm:"-"`
+	NumReleases         int `xorm:"-"`
 
 	IsPrivate bool `xorm:"INDEX"`
 	IsBare    bool `xorm:"INDEX"`
diff --git a/modules/context/repo.go b/modules/context/repo.go
index db643b50b..b16d18842 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -275,7 +275,15 @@ func RepoAssignment() macaron.Handler {
 			return
 		}
 		ctx.Data["Tags"] = tags
-		ctx.Repo.Repository.NumTags = len(tags)
+
+		count, err := models.GetReleaseCountByRepoID(ctx.Repo.Repository.ID, models.FindReleasesOptions{
+			IncludeDrafts: false,
+		})
+		if err != nil {
+			ctx.Handle(500, "GetReleaseCountByRepoID", err)
+			return
+		}
+		ctx.Repo.Repository.NumReleases = int(count)
 
 		ctx.Data["Title"] = owner.Name + "/" + repo.Name
 		ctx.Data["Repository"] = repo
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 7c9100048..8d457e7dc 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -81,7 +81,7 @@
 
 			{{if and (.Repository.UnitEnabled $.UnitTypeReleases) (not .IsBareRepo) }}
 			<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
-				<i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
+				<i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumReleases}}gray{{else}}blue{{end}} small label">{{.Repository.NumReleases}}</span>
 			</a>
 			{{end}}