opendev/gerrit
Code Issues Proposed changes

InlineEdit: Don't hide "Edit Message" for change edits

Browse Source 
As flagged by reviewers in comments to I4d7046335 the implementation of
commit message manipulation in context of change edit wasn't consistent:

* Go to regular patch set (not change edit)
* Click on "Edit Message" button, edit message popup dialog appears
* Change commit message
* Save commit message
* Change edit is created
* "Edit Message" button is hidden unless the Change edit is published
or deleted.

"Edit Message" button should be visible and work as usual for change
edits as well. This change implements this behaviour. Now commit message
for change edits can be changed in two places: from the file table, by
clicking on commit message or by activating edit message popup dialog by
clicking in "Edit Message" button on change info line.

Change-Id: I1d6e64206fd037760c6dc4a16043071d24ee5a9a
This commit is contained in:
David Ostrovsky
2014-12-18 23:58:23 +01:00
committed by David Pursehouse
parent 4ff04806ed
commit e17347d96b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
View File

@@ -466,12 +466,14 @@ public class ChangeScreen2 extends Screen {
} }
private void initEditMessageAction(ChangeInfo info, String revision) { private void initEditMessageAction(ChangeInfo info, String revision) {
NativeMap<ActionInfo> actions = info.revision(revision).actions(); RevisionInfo revisionInfo = info.revision(revision);
if (actions != null && actions.containsKey("message")) { NativeMap<ActionInfo> actions = revisionInfo.actions();
if ((actions != null && actions.containsKey("message"))
|| revisionInfo.is_edit()) {
editMessage.setVisible(true); editMessage.setVisible(true);
editMessageAction = new EditMessageAction( editMessageAction = new EditMessageAction(
info.legacy_id(), info.legacy_id(),
info.revision(revision).commit().message(), revisionInfo.commit().message(),
style, style,
editMessage, editMessage,
reply); reply);