From cd40e68ddea1b52da9eaadb6e8f62c86bcfd3d54 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 27 Nov 2019 19:39:42 +0100
Subject: [PATCH] submit-queue.tmpl: move HEAD information to result

---
 public/submit-queue.tmpl.html | 40 +++++++++++++++++++++++------------
 submitqueue/result.go         |  1 +
 submitqueue/submitqueue.go    |  1 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/public/submit-queue.tmpl.html b/public/submit-queue.tmpl.html
index b6bc79f6c..27d8e9fdc 100644
--- a/public/submit-queue.tmpl.html
+++ b/public/submit-queue.tmpl.html
@@ -40,10 +40,6 @@
           <th scope="row">Branch Name:</th>
           <td>{{ .branchName }}</td>
         </tr>
-        <tr>
-          <th scope="row">HEAD:</th>
-	        <td><code>{{ .HEAD }}</code></td>
-        </tr>
         <tr>
           <th scope="row">Currently running:</th>
 	  <td>
@@ -70,16 +66,34 @@
           </div>
           <div id="history-collapse-{{ $i }}" class="collapse {{ if eq $i 0 }} show{{ end }}" data-parent="#history-accordion">
             <div class="card-body">
-              <!--// TODO: HEAD-->
-              {{ if $result.Error }}
-              <div class="text-danger">{{ $result.Error }}</div>
-              {{ end }}
-              <div class="bg-dark text-white">
-                  {{ range $logEntry := $result.LogEntries }}
-                  <code>{{ $logEntry }}</code>
+              <table class="table">
+                <tbody>
+                  <tr>
+                    <th scope="row">HEAD:</th>
+                    <td><code>{{ .HEAD }}</code></td>
+                  </tr>
+                  {{ if $result.Error }}
+                  <tr>
+                    <th scope="row">Error:</th>
+                    <td class="text-danger">{{ $result.Error }}</td>
+                    </td>
+                  </tr>
                   {{ end }}
-              </div>
-              {{ block "series" $result.Series}}{{ end }}
+                  <tr>
+                    <th scope="row">Log:</th>
+                    <td class="bg-dark text-white">
+                        {{ range $logEntry := $result.LogEntries }}
+                        <code>{{ $logEntry }}</code><br />
+                        {{ end }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2">
+                      {{ block "series" $result.Series}}{{ end }}
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
             </div>
           </div>
         </div>
diff --git a/submitqueue/result.go b/submitqueue/result.go
index a5ca66201..a15c2968f 100644
--- a/submitqueue/result.go
+++ b/submitqueue/result.go
@@ -17,6 +17,7 @@ type Result struct {
 	Series     []Serie
 	Error      error
 	startTime  time.Time
+	HEAD       string
 }
 
 // MakeResult produces a new Result struct,
diff --git a/submitqueue/submitqueue.go b/submitqueue/submitqueue.go
index bd0ee230a..eb622db68 100644
--- a/submitqueue/submitqueue.go
+++ b/submitqueue/submitqueue.go
@@ -171,6 +171,7 @@ func (s *SubmitQueue) Run(fetchOnly bool) *Result {
 		return r
 	}
 	s.HEAD = commitID
+	r.HEAD = commitID
 
 	err = s.LoadSeries(log)
 	if err != nil {