opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1' into stable-3.2

Browse Source 
* stable-3.1:
  When writing temporary plugin files, ensure the directory exists
  Update git submodules
  Update git submodules
  Fix gr-label-info test
  Set version to 2.16.21-SNAPSHOT
  Set version to 2.16.20
  Trim parameterized strings evaluated from LdapRealm
  Update account full name when it changes in LDAP
  Set Api version for plugin jars
  Update git submodules
  Update git submodules
  Update git submodules
  Update git submodules
  Update git submodules
  Update git submodules
  e2e-tests: Add {Approve|Submit}Change core scenarios
  Hide "No Votes" notice for for labels added and approved by rules

Change-Id: I5c2450f3ead115d143102eeaff990e8daf66f5e8
This commit is contained in:
Luca Milanesio
2020-06-01 13:40:49 +01:00
parent f8132e45e7 92b792a78f
commit 96f9751ba8
20 changed files with 268 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -232,6 +232,18 @@ suite('gr-account-link tests', () => {
element.labelInfo = {all: [{value: 1}]};
assert.isTrue(isHidden(element.shadowRoot
.querySelector('.placeholder')));
element.labelInfo = {rejected: []};
assert.isTrue(isHidden(element.shadowRoot
.querySelector('.placeholder')));
element.labelInfo = {values: [], rejected: [], all: [{value: 1}]};
assert.isTrue(isHidden(element.shadowRoot
.querySelector('.placeholder')));
element.labelInfo = {approved: []};
assert.isTrue(isHidden(element.shadowRoot
.querySelector('.placeholder')));
element.labelInfo = {values: [], approved: [], all: [{value: 1}]};
assert.isTrue(isHidden(element.shadowRoot
.querySelector('.placeholder')));
});
});
</script>