opendev/gerrit
Code Issues Proposed changes

Make sure 'Merge Conflict' displays on change view

Browse Source 
Previously, if a change status was 'NEW' the function that determines
if 'Merge Conflict' should be displayed was not called. This change
ensures that it is not bypassed if a change is 'NEW'

Change-Id: Ia014452be5d7b8a24abb6a8b29483dd5289cc515
This commit is contained in:
Becky Siegel
2017-05-17 21:05:49 +00:00
committed by Paladox
parent b9400254a6
commit 94db86fc1b
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,16 +576,14 @@
},
_computeChangeStatus: function(change, patchNum) {
var statusString;
var statusString = this.changeStatusString(change);
if (change.status === this.ChangeStatus.NEW) {
var rev = this.getRevisionByPatchNum(change.revisions, patchNum);
if (rev && rev.draft === true) {
statusString = 'Draft';
}
} else {
statusString = this.changeStatusString(change);
}
return statusString || '';
return statusString;
},
_computeShowCommitInfo: function(changeStatus, current_revision) {

20
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
View File

@@ -607,6 +607,26 @@ limitations under the License.
assert.equal(status, 'Draft');
});
test('change status conflict', function() {
element._changeNum = '1';
element._patchRange = {
basePatchNum: 'PARENT',
patchNum: 1,
};
element._change = {
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
revisions: {
rev1: {_number: 1},
},
current_revision: 'rev1',
mergeable: false,
status: 'NEW',
labels: {},
};
var status = element._computeChangeStatus(element._change, '1');
assert.equal(status, 'Merge Conflict');
});
test('change status merged', function() {
element._changeNum = '1';
element._patchRange = {