ChangeScreen: Enable Delete Edit for merged changes
Change-Id: Ib51cb65954ed99c2dbd63cec93d9b405c638fa43
This commit is contained in:
parent
7658370c78
commit
e7fc0eb55f
@ -569,9 +569,10 @@ public class ChangeScreen extends Screen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void initEditMode(ChangeInfo info, String revision) {
|
private void initEditMode(ChangeInfo info, String revision) {
|
||||||
if (Gerrit.isSignedIn() && info.status().isOpen()) {
|
if (Gerrit.isSignedIn()) {
|
||||||
RevisionInfo rev = info.revision(revision);
|
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);
|
editMode.setVisible(fileTableMode == FileTable.Mode.REVIEW);
|
||||||
addFile.setVisible(!editMode.isVisible());
|
addFile.setVisible(!editMode.isVisible());
|
||||||
deleteFile.setVisible(!editMode.isVisible());
|
deleteFile.setVisible(!editMode.isVisible());
|
||||||
@ -593,10 +594,12 @@ public class ChangeScreen extends Screen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (rev.isEdit()) {
|
if (rev.isEdit()) {
|
||||||
if (info.hasEditBasedOnCurrentPatchSet()) {
|
if (isOpen) {
|
||||||
publishEdit.setVisible(true);
|
if (info.hasEditBasedOnCurrentPatchSet()) {
|
||||||
} else {
|
publishEdit.setVisible(true);
|
||||||
rebaseEdit.setVisible(true);
|
} else {
|
||||||
|
rebaseEdit.setVisible(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
deleteEdit.setVisible(true);
|
deleteEdit.setVisible(true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user