opendev
/
gerrit
Code Issues Proposed changes

Merge "Ask user to confirm deletion of change edit/draft change/draft revision"

This commit is contained in:
David Pursehouse 2015-01-08 08:24:22 +00:00 committed by Gerrit Code Review
parent 0cd539fe42 a6f81bea0b
commit 5706bd0d98
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.java
View File

@ -28,6 +28,7 @@ import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
@ -208,7 +209,9 @@ class Actions extends Composite {
@UiHandler("deleteEdit")
void onDeleteEdit(@SuppressWarnings("unused") ClickEvent e) {
EditActions.deleteEdit(changeId);
if (Window.confirm(Resources.C.deleteChangeEdit())) {
EditActions.deleteEdit(changeId);
}
}
@UiHandler("publishEdit")
@ -223,12 +226,16 @@ class Actions extends Composite {
@UiHandler("deleteRevision")
void onDeleteRevision(@SuppressWarnings("unused") ClickEvent e) {
DraftActions.delete(changeId, revision);
if (Window.confirm(Resources.C.deleteDraftRevision())) {
DraftActions.delete(changeId, revision);
}
}
@UiHandler("deleteChange")
void onDeleteChange(@SuppressWarnings("unused") ClickEvent e) {
DraftActions.delete(changeId);
if (Window.confirm(Resources.C.deleteDraftChange())) {
DraftActions.delete(changeId);
}
}
@UiHandler("restore")

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeConstants.java
View File

@ -49,4 +49,8 @@ interface ChangeConstants extends Constants {
String indirectAncestor();
String merged();
String abandoned();
String deleteChangeEdit();
String deleteDraftChange();
String deleteDraftRevision();
}

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeConstants.properties
View File

@ -30,3 +30,9 @@ noChanges = No Changes
indirectAncestor = Indirect ancestor
merged = Merged
abandoned = Abandoned
deleteChangeEdit = Delete Change Edit?\n\
\n\
All changes made in the edit revision will be lost.
deleteDraftChange = Delete Draft Change?
deleteDraftRevision = Delete Draft Revision?