opendev/gerrit
Code Issues Proposed changes

Re-enable the Cherry Pick button when cancelled

Browse Source 
If the Cherry Pick dialog is cancelled, the Cherry Pick button
cannot be clicked again.

Change-Id: I5c2fb48ae4b01cfa122797b84a226cfb4ef6efe5
(cherry picked from commit 06810e758c)
This commit is contained in:
Zalan Blenessy
2015-01-15 10:59:24 +01:00
committed by David Pursehouse
parent 7794b9e5e8
commit 92b976c2f4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CherryPickAction.java
View File

@@ -23,10 +23,14 @@ import com.google.gerrit.client.ui.CherryPickDialog;
import com.google.gerrit.common.PageLinks; import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gwt.event.logical.shared.CloseEvent;
import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FocusWidget;
import com.google.gwt.user.client.ui.PopupPanel;
class CherryPickAction { class CherryPickAction {
static void call(Button b, final ChangeInfo info, final String revision, static void call(final Button b, final ChangeInfo info, final String revision,
String project, final String commitMessage) { String project, final String commitMessage) {
// TODO Replace CherryPickDialog with a nicer looking display. // TODO Replace CherryPickDialog with a nicer looking display.
b.setEnabled(false); b.setEnabled(false);
@@ -62,6 +66,12 @@ class CherryPickAction {
} }
}); });
} }
@Override
public void onClose(CloseEvent<PopupPanel> event) {
super.onClose(event);
b.setEnabled(true);
}
}.center(); }.center();
} }
} }