diff --git a/lib/shared/addon/components/form-scoped-roles/component.js b/lib/shared/addon/components/form-scoped-roles/component.js index cdb51646c..44df0d521 100644 --- a/lib/shared/addon/components/form-scoped-roles/component.js +++ b/lib/shared/addon/components/form-scoped-roles/component.js @@ -70,31 +70,11 @@ export default Component.extend(NewOrEdit,{ return get(this, 'globalStore').createRecord(role); }, - validate: function () { - var errors = []; - if ((get(this, 'primaryResource.subjectName') || '').trim().length === 0) { - errors.push(get(this, 'intl').findTranslationByKey('formScopedRoles.errors.userRequired')); - } - if (errors.length) { - set(this, 'errors', errors.uniq()); - return false; - } else { - set(this, 'errors', null); - } - return true; - }, - actions: { cancel() { this.sendAction('cancel'); }, save(cb) { - if(!this.validate()) { - if ( cb ) { - cb(); - } - return; - } let mode = get(this, 'mode'); let add = []; let remove = []; @@ -118,6 +98,13 @@ export default Component.extend(NewOrEdit,{ } + if(!this.validate()) { + if ( cb ) { + cb(); + } + return; + } + return PromiseAll(add.map(x => x.save())).then(() => { return PromiseAll(remove.map(x => x.delete())).then(() => { return this.doneSaving(); diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 247f0e205..aaf59ffeb 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -2262,8 +2262,6 @@ formGlobalRoles: formScopedRoles: title: '{type} Permissions' description: 'Controls what access users have to the {type}.' - errors: - userRequired: Please select a user. mode: admin: