diff options
| author | Tomas Daarstad <tomas.daarstad@tieto.com> | 2012-02-01 12:05:55 +0100 |
|---|---|---|
| committer | Tomas Ljunggren <tomas.ljunggren@tieto.com> | 2012-02-03 10:10:08 +0100 |
| commit | 648b82a40c6c9788368bf348b467df905e4432e0 (patch) | |
| tree | b2e74d5c5fe045fdb92787eddf7bba6b74b72ca6 | |
| parent | 1482e279a2dbf59320c1482a537fcc87b7eabad7 (diff) | |
Integration release of NQt GerritBL-QTQAINFRA-468
Fixed JIRA issues:
167 Fixed gerrit email verification link requires insecure login
220 Added a check to prevent NumberFormatException
270 Fixed review database update from StagingApprove
335 Fixed automatic update of reviewer list
347 Fixed late removal of review approvals
348 Fixed cherry pick footer settings
350 Consider sanity review column
352 Fix typo in project config's topic review checkbox label
355 Hide review panel also on diff and topic pages
372 Validate topic current change set
375 Topic permalink copy to clipboard corrected
381 Do not permit trailing slash when pushing
385 Keep highlight on review request
389 Set patch approval changeOpen to false
411 Updated to use current patch id in loadFileList method.
Change-Id: I58bc52c610a9080f40dd962157d6cda4f64102d9
Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java index 90fb7e3d0b..a4ad60e760 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java @@ -33,6 +33,7 @@ import com.google.gerrit.reviewdb.AccountDiffPreference; import com.google.gerrit.reviewdb.Change; import com.google.gerrit.reviewdb.Patch; import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSet.Id; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.KeyPressEvent; @@ -215,11 +216,13 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements private KeyNavigation keyNavigation; private List<Diff> diffs; private Diff.Factory diffFactory; + private Id id; public AllInOnePatchScreen(final PatchSet.Id patchSetId, final PatchSetDetail detail, final PatchTable patchTable, AbstractPatchScreen.Type patchScreenType) { super(null, patchSetId, detail, patchTable); + setPatchId(patchSetId); diffs = new ArrayList<Diff>(); keyNavigation = new KeyNavigation(this); keyNavigation.addNavigationKey(new UpToChangeCommand(patchSetId, 0, 'u')); @@ -318,6 +321,14 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements lastScript = null; } + private Id getPatchId() { + return id; + } + + private void setPatchId(Id id) { + this.id = id; + } + private boolean canReuse(AccountDiffPreference dp, PatchScript last) { if (last.getDiffPrefs().getIgnoreWhitespace() != dp.getIgnoreWhitespace()) { // Whitespace ignore setting requires server computation. @@ -399,7 +410,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements private void loadFileList() { if (patchSetDetail == null) { - Util.DETAIL_SVC.patchSetDetail(idSideB, + Util.DETAIL_SVC.patchSetDetail(getPatchId(), new GerritCallback<PatchSetDetail>() { @Override public void onSuccess(PatchSetDetail result) { |