diff options
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() { |