summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Daarstad <tomas.daarstad@tieto.com>2012-04-02 10:01:21 +0200
committerTomas Daarstad <tomas.daarstad@tieto.com>2012-04-02 10:49:24 +0200
commit281275d4f1465cf2454c7947989dfbee1e7f14cf (patch)
tree1f92fc89d94795b28f502a3f2c287d83ea513783
parentfc1d35bc50f20d7bd0be5bd58e8e329b8451b197 (diff)
Integration release of NQt Gerrit
Fixed JIRA issues: 167 Fixed gerrit email verification link requires insecure login 195 Added support for European style dates 220 Added a check to prevent NumberFormatException 270 Fixed review database update from StagingApprove 335 Fixed automatic update of reviewer list 340 Don't send mail for publishing comments for stage approved 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 366 Set the stage and submit button to disable when create 372 Validate topic current change set 375 Topic permalink copy to clipboard corrected 381 Do not permit trailing slash when pushing 382 Integration release of NQt Gerrit 382 Added a check to prevent NullPointerException Added a check to prevent ArrayIndexOutOfBoundsException 385 Keep highlight on review request 389 Set patch approval changeOpen to false 411 Updated to use current patch id in loadFileList method. 456 Remove leading and trailing whitespace in username when creating a request 462 Updated for eclipse 3.7, m2e and fixed the full name of the MAVEN2_CLASSPATH_CONTAINER 468 Fixed the Review score put on wrong change Change-Id: I0449e0921555bf87e08fbfb0662e86f2359851d0
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java2
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java14
2 files changed, 10 insertions, 6 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
index d904f82770..9224e5ace2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
@@ -174,6 +174,7 @@ class ChangeSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
stageChangeSetButton =
new Button(Util.TM
.stageChangeSet(detail.getChangeSet().getChangeSetId()));
+ stageChangeSetButton.setEnabled(false);
stageChangeSetButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(final ClickEvent event) {
@@ -199,6 +200,7 @@ class ChangeSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
submitChangeSetButton =
new Button(Util.TM
.submitChangeSet(detail.getChangeSet().getChangeSetId()));
+ submitChangeSetButton.setEnabled(false);
submitChangeSetButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(final ClickEvent event) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
index d1249e9c97..6b5d69189c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
@@ -199,10 +199,11 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
if (isNew && changeDetail.canStage()) {
// Create button new button and add click handler.
final Button stagingButton = new Button(Util.M.mergeToStagingPatchSet(detail.getPatchSet().getPatchSetId()));
+ stagingButton.setEnabled(false);
- // If the change is included in a topic, the button should be disabled
- if(changeDetail.getChange().getTopicId() != null){
- stagingButton.setEnabled(false);
+ // If the change is not included in a topic, the button should be enabled
+ if(changeDetail.getChange().getTopicId() == null){
+ stagingButton.setEnabled(true);
}
stagingButton.addClickHandler(new ClickHandler() {
@@ -233,10 +234,11 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
final Button b =
new Button(Util.M
.submitPatchSet(detail.getPatchSet().getPatchSetId()));
+ b.setEnabled(false);
- // If the change is included in a topic, the button should be disabled
- if(changeDetail.getChange().getTopicId() != null ){
- b.setEnabled(false);
+ // If the change is not included in a topic, the button should be enabled
+ if(changeDetail.getChange().getTopicId() == null ){
+ b.setEnabled(true);
}
b.addClickHandler(new ClickHandler() {