opendev/gerrit
Code Issues Proposed changes

Merge "Fix using "Default Base For Merges""

Browse Source
This commit is contained in:
Ben Rohlfs
2019-09-18 07:48:37 +00:00
committed by Gerrit Code Review
parent 5a4ae78c0c fccedbc554
commit 17f7dfe7e3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
View File

@@ -890,12 +890,15 @@
_changeChanged(change) { _changeChanged(change) {
if (!change || !this._patchRange || !this._allPatchSets) { return; } if (!change || !this._patchRange || !this._allPatchSets) { return; }
// Update patchNum before getting basePatchNum. // We get the parent first so we keep the original value for basePatchNum
// and not the updated value.
const parent = this._getBasePatchNum(change, this._patchRange);
this.set('_patchRange.patchNum', this._patchRange.patchNum || this.set('_patchRange.patchNum', this._patchRange.patchNum ||
this.computeLatestPatchNum(this._allPatchSets)); this.computeLatestPatchNum(this._allPatchSets));
const parent = this._getBasePatchNum(change, this._patchRange);
this.set('_patchRange.basePatchNum', parent); this.set('_patchRange.basePatchNum', parent);
const title = change.subject + ' (' + change.change_id.substr(0, 9) + ')'; const title = change.subject + ' (' + change.change_id.substr(0, 9) + ')';
this.fire('title-change', {title}); this.fire('title-change', {title});
}, },