opendev
/
gerrit
Code Issues Proposed changes

Do not crash if permitted labels array is empty 

Bug: Issue 9909
Change-Id: Ia4b3a2af7eafb23e314ebac300d5f3e589bf9c72
(cherry picked from commit c03bb0f454)
This commit is contained in:
viktard 2018-10-26 13:37:36 -07:00 committed by Paladox none
parent 7b8b18289c
commit 57d29e919b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.js
View File

@ -69,7 +69,8 @@
},
_computeBlankItems(permittedLabels, label, side) {
if (!permittedLabels || !permittedLabels[label] || !this.labelValues ||
if (!permittedLabels || !permittedLabels[label] ||
!permittedLabels[label].length || !this.labelValues ||
!Object.keys(this.labelValues).length) {
return [];
}
@ -135,7 +136,8 @@
},
_computeAnyPermittedLabelValues(permittedLabels, label) {
return permittedLabels.hasOwnProperty(label);
return permittedLabels.hasOwnProperty(label) &&
permittedLabels[label].length;
},
_computeHiddenClass(permittedLabels, label) {

5
polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_test.html
View File

@ -258,6 +258,11 @@ limitations under the License.
flushAsynchronousOperations();
assert.isOk(element.$$('iron-selector'));
assert.isTrue(element.$$('iron-selector').hidden);
element.permittedLabels = {Verified: []};
flushAsynchronousOperations();
assert.isOk(element.$$('iron-selector'));
assert.isTrue(element.$$('iron-selector').hidden);
});
test('asymetrical labels', () => {