opendev/gerrit
Code Issues Proposed changes

Show 'Delete Edit' button for change edits on closed changes.

Browse Source 
Even if a change was closed, deleting a change edit is possible. E.g.
for merged changes you can't do anything useful with a change edit
that was created before the change was merged. You should at least be
able to get rid of it.

Change-Id: I75ad9b8fa38846d58f916c5482f52ea61a2a2678
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-08-23 13:01:38 +02:00
parent f3f2e2d6b1
commit e7b6b705a7
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -558,35 +558,40 @@ 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)) { if (info.status().isOpen()) {
editMode.setVisible(fileTableMode == FileTable.Mode.REVIEW); if (isEditModeEnabled(info, rev)) {
addFile.setVisible(!editMode.isVisible()); editMode.setVisible(fileTableMode == FileTable.Mode.REVIEW);
deleteFile.setVisible(!editMode.isVisible()); addFile.setVisible(!editMode.isVisible());
renameFile.setVisible(!editMode.isVisible()); deleteFile.setVisible(!editMode.isVisible());
reviewMode.setVisible(!editMode.isVisible()); renameFile.setVisible(!editMode.isVisible());
addFileAction = new AddFileAction( reviewMode.setVisible(!editMode.isVisible());
changeId, info.revision(revision), addFileAction = new AddFileAction(
style, addFile, files); changeId, info.revision(revision),
deleteFileAction = new DeleteFileAction( style, addFile, files);
changeId, info.revision(revision), deleteFileAction = new DeleteFileAction(
style, addFile); changeId, info.revision(revision),
renameFileAction = new RenameFileAction( style, addFile);
changeId, info.revision(revision), renameFileAction = new RenameFileAction(
style, addFile); changeId, info.revision(revision),
} else { style, addFile);
editMode.setVisible(false);
addFile.setVisible(false);
reviewMode.setVisible(false);
}
if (rev.isEdit()) {
if (info.hasEditBasedOnCurrentPatchSet()) {
publishEdit.setVisible(true);
} else { } else {
rebaseEdit.setVisible(true); editMode.setVisible(false);
addFile.setVisible(false);
reviewMode.setVisible(false);
} }
if (rev.isEdit()) {
if (info.hasEditBasedOnCurrentPatchSet()) {
publishEdit.setVisible(true);
} else {
rebaseEdit.setVisible(true);
}
deleteEdit.setVisible(true);
}
} else if (rev.isEdit()) {
deleteEdit.setStyleName(style.highlight());
deleteEdit.setVisible(true); deleteEdit.setVisible(true);
} }
} }