opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Reenable revert button when revert is cancelled
  Add missing --newrev parameter to change-merged hook documentation

Change-Id: If653e664af51db9eaca6724fdf6a5083cc00f1f0
This commit is contained in:
David Pursehouse
2015-04-27 18:24:57 +09:00
parent ea1a3fbedc 90b066fadc
commit d7293d6446
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config-hooks.txt
View File

@@ -75,7 +75,7 @@ This is called whenever a comment is added to a change.
Called whenever a change has been merged.
====
change-merged --change <change id> --change-url <change url> --change-owner <change owner> --project <project name> --branch <branch> --topic <topic> --submitter <submitter> --commit <sha1>
change-merged --change <change id> --change-url <change url> --change-owner <change owner> --project <project name> --branch <branch> --topic <topic> --submitter <submitter> --commit <sha1> --newrev <sha1>
====
=== merge-failed

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java
View File

@@ -22,10 +22,12 @@ import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.ui.TextAreaActionDialog;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gwt.event.logical.shared.CloseEvent;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.PopupPanel;
class RevertAction {
static void call(Button b, final Change.Id id, final String revision,
static void call(final Button b, final Change.Id id, final String revision,
final String commitSubject) {
// TODO Replace ActionDialog with a nicer looking display.
b.setEnabled(false);
@@ -56,6 +58,12 @@ class RevertAction {
}
});
}
@Override
public void onClose(CloseEvent<PopupPanel> event) {
super.onClose(event);
b.setEnabled(true);
}
}.center();
}
}