Merge "Hide commit message edit button in edit mode"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index 533545e..8263329 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -145,7 +145,7 @@
_hideEditCommitMessage: {
type: Boolean,
computed: '_computeHideEditCommitMessage(_loggedIn, ' +
- '_editingCommitMessage, _change)',
+ '_editingCommitMessage, _change, _editMode)',
},
_diffAgainst: String,
/** @type {?string} */
@@ -394,8 +394,9 @@
return this.changeStatuses(change, options);
},
- _computeHideEditCommitMessage(loggedIn, editing, change) {
- if (!loggedIn || editing || change.status === this.ChangeStatus.MERGED) {
+ _computeHideEditCommitMessage(loggedIn, editing, change, editMode) {
+ if (!loggedIn || editing || change.status === this.ChangeStatus.MERGED ||
+ editMode) {
return true;
}
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index 9671711..efbd3dc 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -840,6 +840,10 @@
assert.isFalse(element._computeHideEditCommitMessage(true, false, {}));
assert.isTrue(element._computeHideEditCommitMessage(true, false,
_change));
+ assert.isTrue(element._computeHideEditCommitMessage(true, false, {},
+ true));
+ assert.isFalse(element._computeHideEditCommitMessage(true, false, {},
+ false));
});
test('_handleCommitMessageSave trims trailing whitespace', () => {
