mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render changeset via a separate block

Browse source
This commit is contained in:
Florian Klink 2019-11-27 11:34:42 +01:00
parent 97eb1fae38
commit 1b249600e5
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/frontend.go
View file

@ -68,7 +68,7 @@ func MakeFrontend(runner *submitqueue.Runner) http.Handler {
}, },
} }
tmpl := template.Must(loadTemplate("submit-queue.tmpl.html", funcMap)) tmpl := template.Must(loadTemplate([]string{"submit-queue.tmpl.html", "changeset.tmpl.html"}, funcMap))
tmpl.ExecuteTemplate(c.Writer, "submit-queue.tmpl.html", gin.H{ tmpl.ExecuteTemplate(c.Writer, "submit-queue.tmpl.html", gin.H{
"series": submitQueue.Series, "series": submitQueue.Series,

15
public/changeset.tmpl.html Normal file
View file

@ -0,0 +1,15 @@
{{ define "changeset" }}
<tr>
<td>{{ .OwnerName }}</td>
<td>
<strong>{{ .Subject }}</strong> (<a href="{{ changesetURL . }}" target="_blank">#{{ .Number }}</a>)<br />
<small><code>{{ .CommitID }}</code></small>
</td>
<td>
<span>
{{ if .IsVerified }}<span class="badge badge-success badge-pill">+1 (CI)</span>{{ end }}
{{ if .IsCodeReviewed }}<span class="badge badge-info badge-pill">+2 (CR)</span>{{ end }}
</span>
</td>
</tr>
{{ end }}

16
public/submit-queue.tmpl.html
View file

@ -70,20 +70,8 @@
<tr> <tr>
<td colspan="3" class="{{ if not ($serie | isAutoSubmittable) }}table-primary{{ else }}table-success{{ end }}">Serie with {{ len $serie.ChangeSets }} changes</td> <td colspan="3" class="{{ if not ($serie | isAutoSubmittable) }}table-primary{{ else }}table-success{{ end }}">Serie with {{ len $serie.ChangeSets }} changes</td>
</tr> </tr>
{{ range $changeset := $serie.ChangeSets}} {{ range $changeset := $serie.ChangeSets }}
<tr> {{ block "changeset" $changeset }}{{ end }}
<td>{{ $changeset.OwnerName }}</td>
<td>
<strong>{{ $changeset.Subject }}</strong> (<a href="{{ changesetURL $changeset }}" target="_blank">#{{ $changeset.Number }}</a>)<br />
<small><code>{{ $changeset.CommitID }}</code></small>
</td>
<td>
<span>
{{ if $changeset.IsVerified }}<span class="badge badge-success badge-pill">+1 (CI)</span>{{ end }}
{{ if $changeset.IsCodeReviewed }}<span class="badge badge-info badge-pill">+2 (CR)</span>{{ end }}
</span>
</td>
</tr>
{{ end }} {{ end }}
<tr> <tr>
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>