Skip to content

Commit 69138d4

Browse files
committed
Add status and author edit elements to UI. Add header to info section.
It is desirable to be able to view the status history along with entry and leave dates. Add an edit button for authors to match up with reviewer and committer. Also, explicitly label what we are displaying in the final row.
1 parent 23f06f7 commit 69138d4

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

pgcommitfest/commitfest/templates/patch.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@
2121
<a class="btn btn-default pull-right" href="edit/">Edit</a>
2222
</td>
2323
</tr>
24+
<tr>
25+
<th>Status</th>
26+
<td>{%for c in patch_commitfests %}
27+
<div style="margin-bottom: 3px;">
28+
<a href="/{{c.commitfest.id}}/">{{c.commitfest}}</a>:
29+
<span class="label label-{{c.status|patchstatuslabel}}">{{c.statusstring}}</span>
30+
<span>({{c.enterdate}} to {%if c.leavedate%}{{c.leavedate}}{%else%}present{%endif%})</span>
31+
</div>
32+
{%endfor%}
33+
</td>
34+
</tr>
2435
</tbody>
2536
</table>
2637
</div>

pgcommitfest/commitfest/templates/patch_workflow.inc

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<table class="table table-bordered">
44
<thead>
55
<tr>
6-
<th>Assign To</th>
7-
<th>Annotate</th>
8-
<th>Resolve</th>
9-
<th>Move To</th>
6+
<th>Assign To</th>
7+
<th>Annotate</th>
8+
<th>Resolve</th>
9+
<th>Move To</th>
1010
</tr>
1111
</thead>
1212
<tbody>
@@ -78,12 +78,23 @@
7878

7979
</td>
8080
</tr>
81+
82+
<tr>
83+
<th>Author(s)</th>
84+
<th>Reviewer(s)</th>
85+
<th>Committer</th>
86+
<th>Status</th>
87+
</tr>
88+
8189
<tr>
8290
<!-- Change -->
8391
<td>
8492
{%for author in authors %}
8593
<div>{{author.first_name}} {{author.last_name}}</div>
8694
{%endfor%}
95+
{%if is_author or is_committer %}
96+
<a class="btn btn-default " href="edit/">Edit Authors</a>
97+
{%endif%}
8798
</td>
8899
<!-- Annotate -->
89100
<td>

0 commit comments

Comments
 (0)