diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2022-05-17 11:58:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-17 11:58:00 +0000 |
| commit | 5086635007c72a8956ade8def9a120302f282e58 (patch) | |
| tree | 749fce80ce5c71f6a9a6c76fdd8335289b480d7a | |
| parent | 31147d32f0946b1746b29faa8daaa95d940f08f1 (diff) | |
| parent | 61ccea383ddafe976501cd7f0aebe2ff6ed2002e (diff) | |
Merge "gr-access-section: Fix exception when unknown name is set" into stable-3.5
| -rw-r--r-- | polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts | 4 | ||||
| -rw-r--r-- | polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts index 48f42a4327..67acf00ffe 100644 --- a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts +++ b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts @@ -236,9 +236,9 @@ export class GrAccessSection extends PolymerElement { capabilities?: CapabilityInfoMap ): string | undefined { if (name === GLOBAL_NAME) { - return capabilities?.[permission.id].name; + return capabilities?.[permission.id]?.name; } else if (AccessPermissions[permission.id]) { - return AccessPermissions[permission.id].name; + return AccessPermissions[permission.id]?.name; } else if (permission.value.label) { let behalfOf = ''; if (permission.id.startsWith('labelAs-')) { diff --git a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js index 7182edee75..58d18fce2e 100644 --- a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js +++ b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js @@ -176,6 +176,13 @@ suite('gr-access-section tests', () => { element.capabilities), element.capabilities[permission.id].name); + permission = { + id: 'non-existent', + value: {}, + }; + assert.isUndefined(element._computePermissionName(name, permission, + element.capabilities)); + name = 'refs/for/*'; permission = { id: 'abandon', |