opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Update git submodules
  Update git submodules
  Hide "No Votes" notice for for labels added and approved by rules

Change-Id: Ic503c02631a066265cefb8d93aadb281503e3dcc
This commit is contained in:
David Pursehouse
2020-05-28 18:12:22 +09:00
parent ec6456dee4 52ac1dacc7
commit 02ef5f8c71
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info.js
View File

@@ -149,6 +149,9 @@
* order to trigger computation when a label is removed from the change.
*/
_computeShowPlaceholder(labelInfo, changeLabelsRecord) {
if (!labelInfo.values && (labelInfo.rejected || labelInfo.approved)) {
return 'hidden';
}
if (labelInfo.all) {
for (const label of labelInfo.all) {
if (label.value && label.value != labelInfo.default_value) {

10
polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info_test.html
View File

@@ -225,6 +225,14 @@ limitations under the License.
assert.isFalse(isHidden(element.$$('.placeholder')));
element.labelInfo = {all: [{value: 1}]};
assert.isTrue(isHidden(element.$$('.placeholder')));
element.labelInfo = {rejected: []};
assert.isTrue(isHidden(element.$$('.placeholder')));
element.labelInfo = {values: [], rejected: [], all: [{value: 1}]};
assert.isTrue(isHidden(element.$$('.placeholder')));
element.labelInfo = {accepted: []};
assert.isTrue(isHidden(element.$$('.placeholder')));
element.labelInfo = {values: [], accepted: [], all: [{value: 1}]};
assert.isTrue(isHidden(element.$$('.placeholder')));
});
});
</script>
</script>