Display the approval table on the Publish Comments screen.

The ApprovalTable (displayed only on the ChangeDetail screen currently)
has been added to the PublishCommentScreen, in order to see all
existing votes, and which other users are set as reviewers of the
change.

ApprovalTable also gives hints as to which votes are still required
before the change can be submitted, and it gives the reviewer the
option to add additional reviewers directly from the comment page.

This also fixes an order-of-operations bug pointed out in the initial
change, which was reverted: Ie42f86dc1509749f8cfa4fcea08e2ebf5a793ede.

Bug: Issue 1383
Change-Id: I49a9524871495d02ae3a5887a349ed26485723c0
This commit is contained in:
Joe Hansche
2012-05-16 12:18:07 -04:00
parent bbb8e738bb
commit 522b933e1c
5 changed files with 111 additions and 12 deletions

View File

@@ -20,6 +20,9 @@ import com.google.gerrit.reviewdb.client.PatchLineComment;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class PatchSetPublishDetail {
@@ -28,6 +31,8 @@ public class PatchSetPublishDetail {
protected Change change;
protected List<PatchLineComment> drafts;
protected List<PermissionRange> labels;
protected List<ApprovalDetail> approvals;
protected List<SubmitRecord> submitRecords;
protected List<PatchSetApproval> given;
protected boolean canSubmit;
@@ -39,6 +44,23 @@ public class PatchSetPublishDetail {
this.labels = labels;
}
public List<ApprovalDetail> getApprovals() {
return approvals;
}
public void setApprovals(Collection<ApprovalDetail> list) {
approvals = new ArrayList<ApprovalDetail>(list);
Collections.sort(approvals, ApprovalDetail.SORT);
}
public void setSubmitRecords(List<SubmitRecord> all) {
submitRecords = all;
}
public List<SubmitRecord> getSubmitRecords() {
return submitRecords;
}
public List<PatchSetApproval> getGiven() {
return given;
}