Merge pull request #2729 from westlywright/2.2-bugs

2.2 Bugs

lib/global-admin/addon/accounts/index/controller.js

@@ -8,9 +8,10 @@ export default Controller.extend({
   intl:        service(),
   growl:       service(),
 
-  sortBy:      'username',
+  sortBy:                   'username',
-  refreshing:  false,
+  refreshing:               false,
-  errors:      null,
+  hasRefreshProviderAccess: false,
+  errors:                   null,
 
   headers:    [
     {

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);
+  }
 });

lib/global-admin/addon/accounts/index/template.hbs

@@ -14,22 +14,24 @@
       {{t "accountsPage.index.localLink"}}
     {{/link-to}}
 
-    {{#if refreshing}}
+    {{#if hasRefreshProviderAccess}}
-      <button
+      {{#if refreshing}}
-        class="btn bg-primary btn-sm btn-disabled"
+        <button
-        disabled
+          class="btn bg-primary btn-sm btn-disabled"
-      >
+          disabled
-        <i class="icon icon-spinner icon-spin"></i>
+        >
-        {{t "generic.loading"}}
+          <i class="icon icon-spinner icon-spin"></i>
-      </button>
+          {{t "generic.loading"}}
-    {{else}}
+        </button>
-      <button
+      {{else}}
-        {{action "refreshAllTokens"}}
+        <button
-        class="btn bg-primary btn-sm"
+          {{action "refreshAllTokens"}}
-      >
+          class="btn bg-primary btn-sm"
-        <i class="icon icon-refresh"></i>
+        >
-        {{t "siteAccess.refreshGroups"}}
+          <i class="icon icon-refresh"></i>
-      </button>
+          {{t "siteAccess.refreshGroups"}}
+        </button>
+      {{/if}}
     {{/if}}
   </div>
 </section>

translations/de-de.yaml

@@ -585,7 +585,7 @@ certificatesPage:
     labelText: Domainname
     single: '<a href="https://{cn}" target="_blank" rel="nofollow noreferrer noopener">{cn} <i class="icon icon-sm icon-external-link"/></a>'
     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

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

translations/fa-ir.yaml

@@ -729,7 +729,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
 pageFooter:
   notARelease: (نسخه آزمایشی)
   issues: گزارش مشکل

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:

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

translations/it-it.yaml

@@ -1264,4 +1264,4 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"

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インスタンスに適用するセキュリティグループを選択してください

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: 게시 설정

translations/nb-no.yaml

@@ -934,7 +934,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
 projectGroup:
   none: Navneområde
 pageFooter:

translations/nl-nl.yaml

@@ -555,7 +555,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
 pageFooter:
   help: 'Hulp & Documentatie'
 telemetryOpt:

translations/pt-br.yaml

@@ -1703,7 +1703,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
 pageFooter:
   notARelease: (Não é uma Release)
   help: 'Ajuda'

translations/ru-ru.yaml

@@ -2664,7 +2664,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
   amazonec2:
     region:
       label: Регион

translations/sh-hr.yaml

@@ -105,4 +105,4 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"

translations/sv-se.yaml

@@ -415,7 +415,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
 pageFooter:
   forums: Forum
 projectRow:

translations/uk-ua.yaml

@@ -3082,7 +3082,7 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"
   amazonec2:
     tags:
       valueLabel: Теги

translations/vi-vn.yaml

@@ -166,4 +166,4 @@ nodeDriver:
   amazoneks:
     associateWorkerNodePublicIp:
       radio:
-        default: true
+        default: "Yes"