diff options
author | Ismo Haataja <ismo.haataja@digia.com> | 2014-06-13 16:09:58 +0300 |
---|---|---|
committer | Ismo Haataja <ismo.haataja@digia.com> | 2014-06-19 12:20:34 +0200 |
commit | 9f9d801a36e0b3de06f52be5215e8a4e02cfdd78 (patch) | |
tree | 2a313352b05cacd2d3f525ffa7a798316406707f | |
parent | 10d6d4039de06fd19113a8876ef784bd3499934e (diff) |
Show review scores for staged changes
Review scores (aka submit records) where not fetched because the
function doing this (getSubmitRecords) utilizes 'canSubmit' function
that returns error for a change in STAGING or STAGED state. Added new
parameter (allowStaged) to function interface to allow bypassing this
check and get review scores fetched.
Task-number: QTQAINFRA-859
Change-Id: I48c06e6a5833e762529efb305ef93182d4202572
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
4 files changed, 9 insertions, 8 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 8c8ecfc694..78099a6e40 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -315,7 +315,7 @@ public class ChangeJson { if (ps == null) { return ImmutableList.of(); } - cd.setSubmitRecords(ctl.canSubmit(db.get(), ps, cd, true, false, true)); + cd.setSubmitRecords(ctl.canSubmit(db.get(), ps, cd, true, false, true, true)); return cd.getSubmitRecords(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java index 734d5247ad..636bf2ddde 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java @@ -101,7 +101,7 @@ public class ReviewerJson { PatchSet ps = cd.currentPatchSet(db); if (ps != null) { for (SubmitRecord rec : - ctl.canSubmit(db.get(), ps, cd, true, false, true)) { + ctl.canSubmit(db.get(), ps, cd, true, false, true, true)) { if (rec.labels == null) { continue; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java index 5970efb211..f1126c725f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java @@ -332,7 +332,7 @@ public class ChangeControl { } public List<SubmitRecord> getSubmitRecords(ReviewDb db, PatchSet patchSet) { - return canSubmit(db, patchSet, null, false, true, false); + return canSubmit(db, patchSet, null, false, true, false, true); } public boolean canSubmit() { @@ -340,12 +340,12 @@ public class ChangeControl { } public List<SubmitRecord> canSubmit(ReviewDb db, PatchSet patchSet) { - return canSubmit(db, patchSet, null, false, false, false); + return canSubmit(db, patchSet, null, false, false, false, false); } public List<SubmitRecord> canSubmit(ReviewDb db, PatchSet patchSet, @Nullable ChangeData cd, boolean fastEvalLabels, boolean allowClosed, - boolean allowDraft) { + boolean allowDraft, boolean allowStaged) { if (!allowClosed && change.getStatus().isClosed()) { SubmitRecord rec = new SubmitRecord(); rec.status = SubmitRecord.Status.CLOSED; @@ -361,8 +361,9 @@ public class ChangeControl { return cannotSubmitDraft(db, patchSet, cd); } - if (change.getStatus() == Change.Status.STAGING - || change.getStatus() == Change.Status.STAGED) { + if ((change.getStatus() == Change.Status.STAGING + || change.getStatus() == Change.Status.STAGED) + && !allowStaged) { return cannotSubmitStaged(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java index 06d84c1a7e..f17c0d7914 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java @@ -283,7 +283,7 @@ public class QueryProcessor { PatchSet.Id psId = d.getChange().currentPatchSetId(); PatchSet patchSet = db.get().patchSets().get(psId); List<SubmitRecord> submitResult = d.changeControl().canSubmit( // - db.get(), patchSet, null, false, true, true); + db.get(), patchSet, null, false, true, true, true); eventFactory.addSubmitRecords(c, submitResult); } |