summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmo Haataja <ismo.haataja@digia.com>2014-08-14 12:46:45 +0300
committerIsmo Haataja <ismo.haataja@digia.com>2014-10-15 08:49:03 +0200
commit2f6d90dc0ba7853d32a902dbaf92e69ba133c2b1 (patch)
tree531f930fe80b4091d92fe5f1e40f2f6dae0cde0f
parent8e105c8e609ec95b9428cffcbb6521cbee5c0269 (diff)
Show info message in one page review
Review scores are dropped if a new patch set is pushed or the state has changed to one of CI states (STAGING, STAGED or INTEGRATING) while reviewing. The user is informed about this with a message. Earlier this worked only from Publish Comments (review) page and one page review was lacking this info message, added now. Task-number: QTQAINFRA-888 Change-Id: Iad461a443fe80c622c6875cf7e1c8817cc360a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java9
1 files changed, 9 insertions, 0 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 d4e9d046aa..d74169439a 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
@@ -254,6 +254,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
private List<Diff> diffs;
private Diff.Factory diffFactory;
private Id id;
+ private boolean changeInCI = false;
ChangeInfo change;
@@ -360,6 +361,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
message.setText(lastState.message);
}
revision = result.getPatchSetInfo().getRevId();
+ changeInCI = result.getChange().getStatus().isCI();
stage.setVisible(result.canStage());
submit.setVisible(result.canSubmit());
@@ -716,6 +718,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
data.label(b.label.name(), b.parseValue());
}
}
+ data.changeReviewable(!changeInCI);
enableForm(false);
new RestApi("/changes/")
@@ -730,6 +733,9 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
stage();
} else {
saveStateOnUnload = false;
+ if (!result.getMessage().isEmpty()) {
+ new ErrorDialog(result.getMessage()).center();
+ }
goChange();
}
}
@@ -754,6 +760,9 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements
this.strict_labels = true;
this.drafts = 'PUBLISH';
}-*/;
+ final native void changeReviewable(boolean b) /*-{ this.change_reviewable=b; }-*/;
+
+ public final native String getMessage() /*-{ return this.message; }-*/;
protected ReviewInput() {
}