ChangeTable: Show "Work in Progress" in status column

When a change is in WIP state it was not shown in the status column.

Furthermore, when a WIP change had all the necessary labels to allow
submit, its status was shown as "Merge Conflict".

Bug: Issue 8643
Change-Id: I6a063cc84d306d9471617ff365d2aa06046b59c2
This commit is contained in:
David Pursehouse
2018-04-25 12:31:07 +09:00
parent 41703dc9ff
commit 09db14a3e7

View File

@@ -240,6 +240,11 @@ public class ChangeTable extends NavigationTable<ChangeInfo> {
row,
C_STATUS,
Util.toLongString(status) + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
} else if (c.isWorkInProgress()) {
table.setText(
row,
C_STATUS,
Util.C.workInProgress() + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
} else if (!c.mergeable()) {
table.setText(
row,