Merge branch 'feature-add-principals' into ICU-383-add-principals-to-roles

This commit is contained in:
Randall Morey authored and GitHub committed 2020-09-03 12:05:45 -04:00
commit d38ac72deb
3 files changed
+4 -2

No files matched your search

@@ -53,4 +53,4 @@
</message.link>
</Rose::Message>
</Rose::Layout::Centered>
{{/unless}}
{{/unless}}
@@ -4,6 +4,7 @@ import { A } from '@ember/array';
export default class FormRoleAddPrincipalsIndexComponent extends Component {
// =properties
/**
@@ -52,4 +53,5 @@ export default class FormRoleAddPrincipalsIndexComponent extends Component {
submit(fn) {
fn(this.selectedPrincipalIDs);
}
}
@@ -29,7 +29,6 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
const role = this.modelFor('scopes.scope.roles.role');
const { scopeID } = role;
const options = { adapterOptions: { scopeID } };
return hash({
role,
users: this.store.findAll('user', options),
@@ -87,4 +86,5 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
cancel() {
this.replaceWith('scopes.scope.roles.role.principals');
}
}