diff --git a/ui/core/app/routes/scopes/scope/roles/role.js b/ui/core/app/routes/scopes/scope/roles/role.js
index 6269e7748..9a0012328 100644
--- a/ui/core/app/routes/scopes/scope/roles/role.js
+++ b/ui/core/app/routes/scopes/scope/roles/role.js
@@ -17,31 +17,26 @@ export default class ScopesScopeRolesRoleRoute extends Route {
}
/**
- * Renders the route-specific templates for header, navigation,
+ * Renders the role specific templates for header, navigation,
* and actions page sections.
* @override
- * @param {object} controller
- * @param {object} model
*/
- renderTemplate(controller, model) {
+ renderTemplate() {
super.renderTemplate(...arguments);
this.render('scopes/scope/roles/role/-header', {
into: 'scopes/scope/roles/role',
outlet: 'header',
- model
- });
-
- this.render('scopes/scope/roles/role/-actions', {
- into: 'scopes/scope/roles/role',
- outlet: 'actions',
- model
});
this.render('scopes/scope/roles/role/-navigation', {
into: 'scopes/scope/roles/role',
outlet: 'navigation',
- model
+ });
+
+ this.render('scopes/scope/roles/role/-actions', {
+ into: 'scopes/scope/roles/role',
+ outlet: 'actions',
});
}
}
diff --git a/ui/core/app/routes/scopes/scope/roles/role/add-principals.js b/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
index b4854a825..e8d175dcb 100644
--- a/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
+++ b/ui/core/app/routes/scopes/scope/roles/role/add-principals.js
@@ -13,7 +13,7 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
// =methods
/**
- * Emtpy out any previously loaded users and groups
+ * Empty out any previously loaded users and groups
* (collectively, principals).
*/
beforeModel() {
@@ -32,8 +32,10 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
});
}
+ // =methods
+
/**
- * Empties the actions and navigation outlets and renders a custom header.
+ * Renders the add-principals-specific header template.
* @override
*/
renderTemplate() {
@@ -41,17 +43,17 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
this.render('scopes/scope/roles/role/add-principals/-header', {
into: 'scopes/scope/roles/role',
- outlet: 'header'
+ outlet: 'header',
});
this.render('-empty', {
into: 'scopes/scope/roles/role',
- outlet: 'actions'
+ outlet: 'navigation',
});
this.render('-empty', {
into: 'scopes/scope/roles/role',
- outlet: 'navigation'
+ outlet: 'actions',
});
}
@@ -79,5 +81,4 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
cancel() {
this.replaceWith('scopes.scope.roles.role.principals');
}
-
}
diff --git a/ui/core/app/templates/scopes/scope/roles/role.hbs b/ui/core/app/templates/scopes/scope/roles/role.hbs
index 271a98d73..2a878ff51 100644
--- a/ui/core/app/templates/scopes/scope/roles/role.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role.hbs
@@ -10,14 +10,14 @@
{{outlet "header"}}
-
- {{outlet "actions"}}
-
-
{{outlet "navigation"}}
+
+ {{outlet "actions"}}
+
+
{{outlet}}