diff --git a/lib/global-admin/addon/accounts/index/controller.js b/lib/global-admin/addon/accounts/index/controller.js index 33bcb7798..b8939592a 100644 --- a/lib/global-admin/addon/accounts/index/controller.js +++ b/lib/global-admin/addon/accounts/index/controller.js @@ -8,9 +8,10 @@ export default Controller.extend({ intl: service(), growl: service(), - sortBy: 'username', - refreshing: false, - errors: null, + sortBy: 'username', + refreshing: false, + hasRefreshProviderAccess: false, + errors: null, headers: [ { diff --git a/lib/global-admin/addon/accounts/index/route.js b/lib/global-admin/addon/accounts/index/route.js index 306b1fcbf..3518edb6e 100644 --- a/lib/global-admin/addon/accounts/index/route.js +++ b/lib/global-admin/addon/accounts/index/route.js @@ -1,10 +1,33 @@ import Route from '@ember/routing/route'; import { inject as service } from '@ember/service'; -import { get } from '@ember/object'; +import { get, set } from '@ember/object'; export default Route.extend({ - globalStore: service(), + globalStore: service(), + hasRefreshProviderAccess: false, + model() { return get(this, 'globalStore').findAll('user'); }, + + afterModel() { + return this.globalStore.rawRequest({ + url: `users`, + method: 'GET', + }).then((users) => { + if (get(users, 'body.actions.refreshauthprovideraccess')) { + set(this, 'hasRefreshProviderAccess', true); + } + + return; + }) + }, + + setupController(controller, model) { + if (get(this, 'hasRefreshProviderAccess')) { + controller.set('hasRefreshProviderAccess', true); + } + + this._super(controller, model); + } }); diff --git a/lib/global-admin/addon/accounts/index/template.hbs b/lib/global-admin/addon/accounts/index/template.hbs index 816ee5dab..3e124e75f 100644 --- a/lib/global-admin/addon/accounts/index/template.hbs +++ b/lib/global-admin/addon/accounts/index/template.hbs @@ -14,22 +14,24 @@ {{t "accountsPage.index.localLink"}} {{/link-to}} - {{#if refreshing}} - - {{else}} - + {{#if hasRefreshProviderAccess}} + {{#if refreshing}} + + {{else}} + + {{/if}} {{/if}} diff --git a/translations/de-de.yaml b/translations/de-de.yaml index b453f2f04..d2a368817 100644 --- a/translations/de-de.yaml +++ b/translations/de-de.yaml @@ -585,7 +585,7 @@ certificatesPage: labelText: Domainname single: '{cn} ' withSan: | - + wildcardSingle: '{cn}' wildcardWithSan: | {cn} + @@ -1168,7 +1168,7 @@ stackPage: detail: 'Load-Balancer-Container, die von diesem Stack getrennt sind' status: | {count, plural, - =0 {Kein Balancer} + =0 {Kein Balancer} =1 {# Balancer} other {# Balancer} } @@ -1177,7 +1177,7 @@ stackPage: detail: 'Load-Balancer, die von diesem Stack getrennt sind' status: | {count, plural, - =0 {Keine Einträge} + =0 {Keine Einträge} =1 {# Eintrag} other {# Einträge} } @@ -2806,7 +2806,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" amazonec2: portHelp: link: Mehr erfahren diff --git a/translations/es-es.yaml b/translations/es-es.yaml index f9e670fc3..a8731ccc7 100644 --- a/translations/es-es.yaml +++ b/translations/es-es.yaml @@ -2295,7 +2295,7 @@ cruPersistentVolume: placeholder: "ej. / etc / ceph / keyring" monitors: label: Monitores - addActionLabel: Añadir + addActionLabel: Añadir pool: label: Banco placeholder: "ej. rbd" @@ -4544,7 +4544,7 @@ nodeDriver: loading: "Cargando grupos de seguridad de Amazon..." associateWorkerNodePublicIp: radio: - default: true + default: "Yes" securityGroup: title: Grupos de seguridad detail: Elija los grupos de seguridad que se aplicarán a las instancias de EKS diff --git a/translations/fa-ir.yaml b/translations/fa-ir.yaml index 72815ae93..751a8be8a 100644 --- a/translations/fa-ir.yaml +++ b/translations/fa-ir.yaml @@ -729,7 +729,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" pageFooter: notARelease: (نسخه آزمایشی) issues: گزارش مشکل diff --git a/translations/fr-fr.yaml b/translations/fr-fr.yaml index f49eaf9e2..8458b756c 100644 --- a/translations/fr-fr.yaml +++ b/translations/fr-fr.yaml @@ -1853,7 +1853,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" packet: projectId: label: Projet @@ -1981,7 +1981,7 @@ containerChoices: unknownHost: "Hôte : ???" containerOption: "{name}" nav: - srToggleDropdown: Activer/Désactiver la liste déroulante + srToggleDropdown: Activer/Désactiver la liste déroulante containers: addDns: Ajouter un enregistrement catalog: diff --git a/translations/hu-hu.yaml b/translations/hu-hu.yaml index 28b8cd0f2..d85e9fa91 100644 --- a/translations/hu-hu.yaml +++ b/translations/hu-hu.yaml @@ -1027,7 +1027,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" pageFooter: notARelease: (Nem egy Kiadás) issues: Hiba jelentése diff --git a/translations/it-it.yaml b/translations/it-it.yaml index 2391dda8f..b2c945268 100644 --- a/translations/it-it.yaml +++ b/translations/it-it.yaml @@ -1264,4 +1264,4 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" diff --git a/translations/ja-jp.yaml b/translations/ja-jp.yaml index 6cf9df60f..937c760d5 100644 --- a/translations/ja-jp.yaml +++ b/translations/ja-jp.yaml @@ -1029,7 +1029,7 @@ loginPage: shibbolethError: 401: "認証に失敗しました" 500: "サーバ内部エラー" - generic: "ログイン中にエラー {{errorCode}} が発生しました。もう一度やり直してください。" + generic: "ログイン中にエラー {errorCode} が発生しました。もう一度やり直してください。" error: authFailedCreds: "ログインに失敗しました: 認証情報が間違っているか、アカウントにログインする権限が与えられていない可能性があります。" authFailed: "ログインに失敗しました: アカウントにログインする権限が与えられていない可能性があります。" @@ -2785,7 +2785,7 @@ moveNamespace: {count, plural, =1 {個の名前空間: {name}} other {# 個の名前空間} - }の移動: + }の移動: to: "移動先のプロジェクト:" actionLabel: 移動 stackHeader: @@ -4311,7 +4311,7 @@ nodeDriver: loading: "Amazonからセキュリティグループをロード中..." associateWorkerNodePublicIp: radio: - default: true + default: "Yes" securityGroup: title: セキュリティグループ detail: EKSインスタンスに適用するセキュリティグループを選択してください diff --git a/translations/ko-kr.yaml b/translations/ko-kr.yaml index 217fd8ab8..4ddc4c7c0 100644 --- a/translations/ko-kr.yaml +++ b/translations/ko-kr.yaml @@ -37,7 +37,7 @@ generic: enabled: 활성화됨 entrypoint: Entrypoint environment: 환경 - expandAll: 모두 확장 + expandAll: 모두 확장 from: 출처 generic: '일반' gigabyte: 'GB' @@ -893,7 +893,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" azure: publishSettingsFile: label: 게시 설정 diff --git a/translations/nb-no.yaml b/translations/nb-no.yaml index 55126f96e..f0eb45103 100644 --- a/translations/nb-no.yaml +++ b/translations/nb-no.yaml @@ -934,7 +934,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" projectGroup: none: Navneområde pageFooter: diff --git a/translations/nl-nl.yaml b/translations/nl-nl.yaml index 7a50ed992..3d59ac83c 100644 --- a/translations/nl-nl.yaml +++ b/translations/nl-nl.yaml @@ -555,7 +555,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" pageFooter: help: 'Hulp & Documentatie' telemetryOpt: diff --git a/translations/pt-br.yaml b/translations/pt-br.yaml index 10b24a9af..93e4ca1d5 100644 --- a/translations/pt-br.yaml +++ b/translations/pt-br.yaml @@ -1703,7 +1703,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" pageFooter: notARelease: (Não é uma Release) help: 'Ajuda' diff --git a/translations/ru-ru.yaml b/translations/ru-ru.yaml index 52104f6fd..b2d9824ac 100644 --- a/translations/ru-ru.yaml +++ b/translations/ru-ru.yaml @@ -2664,7 +2664,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" amazonec2: region: label: Регион diff --git a/translations/sh-hr.yaml b/translations/sh-hr.yaml index af704dd1a..c0055f23a 100644 --- a/translations/sh-hr.yaml +++ b/translations/sh-hr.yaml @@ -105,4 +105,4 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" diff --git a/translations/sv-se.yaml b/translations/sv-se.yaml index 11d18bba2..2a7bbb7ce 100644 --- a/translations/sv-se.yaml +++ b/translations/sv-se.yaml @@ -415,7 +415,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" pageFooter: forums: Forum projectRow: diff --git a/translations/uk-ua.yaml b/translations/uk-ua.yaml index 1027c47ae..a27aea635 100644 --- a/translations/uk-ua.yaml +++ b/translations/uk-ua.yaml @@ -3082,7 +3082,7 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes" amazonec2: tags: valueLabel: Теги diff --git a/translations/vi-vn.yaml b/translations/vi-vn.yaml index 7fd23e5fe..2850bead1 100644 --- a/translations/vi-vn.yaml +++ b/translations/vi-vn.yaml @@ -166,4 +166,4 @@ nodeDriver: amazoneks: associateWorkerNodePublicIp: radio: - default: true + default: "Yes"