diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-27T18·39+0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-11-27T18·39+0100 |
| commit | cd40e68ddea1b52da9eaadb6e8f62c86bcfd3d54 (patch) | |
| tree | ffdb318f548cfbc8f9c80e41929f3bb6e7067a70 | |
| parent | ba62db97e95e87b011d9cc68aade162ef7c8d750 (diff) | |
submit-queue.tmpl: move HEAD information to result
| -rw-r--r-- | public/submit-queue.tmpl.html | 40 | ||||
| -rw-r--r-- | submitqueue/result.go | 1 | ||||
| -rw-r--r-- | 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 b6bc79f6c3a2..27d8e9fdc69e 100644 --- a/public/submit-queue.tmpl.html +++ b/public/submit-queue.tmpl.html @@ -41,10 +41,6 @@ <td>{{ .branchName }}</td> </tr> <tr> - <th scope="row">HEAD:</th> - <td><code>{{ .HEAD }}</code></td> - </tr> - <tr> <th scope="row">Currently running:</th> <td> {{ if .currentlyRunning }} @@ -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 a5ca662016b1..a15c2968f30d 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 bd0ee230a903..eb622db6832d 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 { |