diff --git a/ui/core/app/routes/scopes/scope/roles/role/principals.js b/ui/core/app/routes/scopes/scope/roles/role/principals.js index 00cc77303..045d568ce 100644 --- a/ui/core/app/routes/scopes/scope/roles/role/principals.js +++ b/ui/core/app/routes/scopes/scope/roles/role/principals.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { all } from 'rsvp'; +import { all, hash } from 'rsvp'; import { action } from '@ember/object'; import { inject as service } from '@ember/service'; import loading from 'ember-loading/decorator'; @@ -37,7 +37,10 @@ export default class ScopesScopeRolesRolePrincipalsRoute extends Route { model, })) ); - return all(users.concat(groups)); + return hash({ + role, + principals: all(users.concat(groups)), + }); } /** diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs index 18be0b9ea..ba94f66be 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.auth-method.title"}}

{{t "resources.auth-method.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs index 834543f64..938c5fedb 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs @@ -1 +1,2 @@

{{t "resources.account.title"}}

+

{{@model.id}}

\ No newline at end of file diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs index 53aaf93f6..5c5ee4dd4 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.account.title"}}

{{t 'resources.account.messages.set-password.description'}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs index fe7c5f079..ac1e772a0 100644 --- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs +++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.group.title"}}

{{t "resources.group.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs index 65dddb9f1..77e14a09b 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.host-catalog.title"}}

{{t "resources.host-catalog.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs index 9cc76e026..752eae74c 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.host-set.title"}}

-

{{t "resources.host-set.description"}}

\ No newline at end of file +

{{t "resources.host-set.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs index 5896f2a8c..e8a7b9c8d 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.host.title"}}

-

{{t "resources.host.description"}}

\ No newline at end of file +

{{t "resources.host.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs index 3990c70e8..79c5e6e41 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs @@ -7,6 +7,7 @@

{{t "resources.project.title"}}

{{t "resources.project.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs index 5de87dc3d..280737623 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.target.title"}}

{{t "resources.target.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs index 93f645dfa..ccad156d5 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.role.title"}}

{{t "resources.role.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs index 84be962ee..aa96ca797 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.role.title"}}

{{t "resources.role.grant.description"}}

+

{{@model.id}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs index 5d6b375fd..73ac90715 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs @@ -1,6 +1,6 @@ {{title (t 'resources.role.principal.title_plural')}} -{{#if @model}} +{{#if @model.principals}} @@ -12,7 +12,7 @@ - {{#each @model as |principal|}} + {{#each @model.principals as |principal|}} {{principal.model.displayName}} diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs index 9d7156902..9e369d94e 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs @@ -1,2 +1,3 @@

{{t "resources.role.title"}}

{{t "resources.role.principal.description"}}

+

{{@model.role.id}}

diff --git a/ui/core/app/templates/scopes/scope/users/user/index.hbs b/ui/core/app/templates/scopes/scope/users/user/index.hbs index 198efa389..35db006e9 100644 --- a/ui/core/app/templates/scopes/scope/users/user/index.hbs +++ b/ui/core/app/templates/scopes/scope/users/user/index.hbs @@ -7,6 +7,7 @@

{{t "resources.user.title"}}

{{t "resources.user.description"}}

+

{{@model.id}}