diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index db09586ed..36d341bc4 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -18,11 +18,13 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou * @return {Promise{[HostSetModel]}} */ model() { - const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); - const { id: host_catalog_id } = scope; + const { id: host_catalog_id } = hostCatalog; if ( - this.can.can('list collection', scope, { + this.can.can('list collection', hostCatalog, { collection: 'host-sets', }) ) { diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js index ad76516df..1f49ad3af 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js @@ -1,10 +1,11 @@ import Route from '@ember/routing/route'; export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route { // =methods - setupController(controller) { - const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); super.setupController(...arguments); - controller.setProperties({ scope }); + controller.setProperties({ hostCatalog }); } } diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index e45630421..c814c749e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -52,11 +52,13 @@ > - {{#if (can 'list collection' this.scope collection='host-sets')}} + {{#if (can 'list collection' this.hostCatalog collection='host-sets')}} {{! can list (at least): show default welcome message}} {{t 'resources.host-set.description'}} - {{else if (can 'create collection' this.scope collection='host-sets')}} + {{else if (can + 'create collection' this.hostCatalog collection='host-sets' + )}} {{! can create (only): show create-but-not-list welcome message}} {{t 'descriptions.create-but-not-list' @@ -71,7 +73,7 @@ {{/if}} - {{#if (can 'create collection' this.scope collection='host-sets')}} + {{#if (can 'create collection' this.hostCatalog collection='host-sets')}}