diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js index a58c7cc52..06748f330 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js @@ -14,12 +14,12 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari * @return {Promise{[CredentialLibraryModel]}} */ model() { - const scope = this.modelFor( + const credentialStore = this.modelFor( 'scopes.scope.credential-stores.credential-store' ); - const { id: credential_store_id } = scope; + const { id: credential_store_id } = credentialStore; if ( - this.can.can('list collection', scope, { + this.can.can('list collection', credentialStore, { collection: 'credential-libraries', }) ) { diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index.js index bfc92aa63..0b08bfbc7 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index.js @@ -4,10 +4,10 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari // =methods setupController(controller) { - const scope = this.modelFor( + const credentialStore = this.modelFor( 'scopes.scope.credential-stores.credential-store' ); super.setupController(...arguments); - controller.setProperties({ scope }); + controller.setProperties({ credentialStore }); } } diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs index d263c8a10..f4c87f82b 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs @@ -54,13 +54,19 @@ > {{#if - (can 'list collection' this.scope collection='credential-libraries') + (can + 'list collection' + this.credentialStore + collection='credential-libraries' + ) }} {{! can list (at least): show default welcome message}} {{t 'resources.credential-library.description'}} {{else if (can - 'create collection' this.scope collection='credential-libraries' + 'create collection' + this.credentialStore + collection='credential-libraries' )}} {{! can create (only): show create-but-not-list welcome message}} {{t @@ -77,7 +83,11 @@ {{#if - (can 'create collection' this.scope collection='credential-libraries') + (can + 'create collection' + this.credentialStore + collection='credential-libraries' + ) }}