Show commit status icon in commits table

Author: lafriks

models/status.go

@@ -5,6 +5,7 @@
 package models
 
 import (
+	"container/list"
 	"fmt"
 	"strings"
 	"time"
@@ -252,3 +253,40 @@ func NewCommitStatus(repo *Repository, creator *User, sha string, status *Commit
 
 	return sess.Commit()
 }
+
+type SignCommitWithStatuses struct {
+	Statuses []*CommitStatus
+	State    CommitStatusState
+	*SignCommit
+}
+
+func ParseCommitsWithStatus(oldCommits *list.List, repo *Repository) *list.List {
+	var (
+		newCommits = list.New()
+		e          = oldCommits.Front()
+		err        error
+	)
+
+	for e != nil {
+		c := e.Value.(SignCommit)
+		commit := SignCommitWithStatuses{
+			SignCommit: &c,
+			State:      "",
+			Statuses:   make([]*CommitStatus, 0),
+		}
+		commit.Statuses, err = GetLatestCommitStatus(repo, commit.ID.String(), 0)
+		if err != nil {
+			log.Error(3, "GetLatestCommitStatus: %v", err)
+		} else {
+			for _, status := range commit.Statuses {
+				if status.State.IsWorseThan(commit.State) {
+					commit.State = status.State
+				}
+			}
+		}
+
+		newCommits.PushBack(commit)
+		e = e.Next()
+	}
+	return newCommits
+}

routers/repo/commit.go

@@ -69,6 +69,7 @@ func Commits(ctx *context.Context) {
 	commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
 	commits = models.ValidateCommitsWithEmails(commits)
 	commits = models.ParseCommitsWithSignature(commits)
+	commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
 	ctx.Data["Commits"] = commits
 
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
@@ -123,6 +124,7 @@ func SearchCommits(ctx *context.Context) {
 	commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
 	commits = models.ValidateCommitsWithEmails(commits)
 	commits = models.ParseCommitsWithSignature(commits)
+	commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
 	ctx.Data["Commits"] = commits
 
 	ctx.Data["Keyword"] = keyword
@@ -170,6 +172,7 @@ func FileHistory(ctx *context.Context) {
 	commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
 	commits = models.ValidateCommitsWithEmails(commits)
 	commits = models.ParseCommitsWithSignature(commits)
+	commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
 	ctx.Data["Commits"] = commits
 
 	ctx.Data["Username"] = ctx.Repo.Owner.Name

templates/repo/commits_table.tmpl

@@ -61,6 +61,21 @@
 						</td>
 						<td class="message collapsing">
 							<span class="has-emoji{{if gt .ParentCount 1}} grey text{{end}}">{{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}}</span>
+							{{if eq .State "pending"}}
+							<i class="circle icon grey"></i>
+							{{end}}
+							{{if eq .State "success"}}
+							<i class="check icon green"></i>
+							{{end}}
+							{{if eq .State "error"}}
+							<i class="warning icon red"></i>
+							{{end}}
+							{{if eq .State "failure"}}
+							<i class="remove icon red"></i>
+							{{end}}
+							{{if eq .State "warning"}}
+							<i class="circle icon yellow"></i>
+							{{end}}
 						</td>
 						<td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td>
 					</tr>