ChangeScreen: Enable Delete Edit for merged changes

Change-Id: Ib51cb65954ed99c2dbd63cec93d9b405c638fa43
This commit is contained in:
Orgad Shaneh 2016-12-26 14:32:17 +02:00
parent 7658370c78
commit e7fc0eb55f

View File

@ -569,9 +569,10 @@ public class ChangeScreen extends Screen {
}
private void initEditMode(ChangeInfo info, String revision) {
if (Gerrit.isSignedIn() && info.status().isOpen()) {
if (Gerrit.isSignedIn()) {
RevisionInfo rev = info.revision(revision);
if (isEditModeEnabled(info, rev)) {
boolean isOpen = info.status().isOpen();
if (isOpen && isEditModeEnabled(info, rev)) {
editMode.setVisible(fileTableMode == FileTable.Mode.REVIEW);
addFile.setVisible(!editMode.isVisible());
deleteFile.setVisible(!editMode.isVisible());
@ -593,11 +594,13 @@ public class ChangeScreen extends Screen {
}
if (rev.isEdit()) {
if (isOpen) {
if (info.hasEditBasedOnCurrentPatchSet()) {
publishEdit.setVisible(true);
} else {
rebaseEdit.setVisible(true);
}
}
deleteEdit.setVisible(true);
}
}