opendev/gerrit
Code Issues Proposed changes

Merge "Make "closed" states precede "open" ones in the change list"

Browse Source
This commit is contained in:
Andrew Bonventre
2016-03-18 21:31:39 +00:00
committed by Gerrit Code Review
parent dfdc8548b2 a3772d7667
commit 72c5a61d69
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
View File

@@ -52,18 +52,21 @@
}, },
_computeChangeStatusString: function(change) { _computeChangeStatusString: function(change) {
// "Closed" states should take precedence over "open" ones.
if (change.status == this.ChangeStatus.MERGED) { if (change.status == this.ChangeStatus.MERGED) {
return 'Merged'; return 'Merged';
} }
if (change.status == this.ChangeStatus.ABANDONED) {
return 'Abandoned';
}
if (change.mergeable != null && change.mergeable == false) { if (change.mergeable != null && change.mergeable == false) {
return 'Merge Conflict'; return 'Merge Conflict';
} }
if (change.status == this.ChangeStatus.DRAFT) { if (change.status == this.ChangeStatus.DRAFT) {
return 'Draft'; return 'Draft';
} }
if (change.status == this.ChangeStatus.ABANDONED) {
return 'Abandoned';
}
return ''; return '';
}, },