diff --git a/lib/global-admin/addon/global-dns/entries/new/controller.js b/lib/global-admin/addon/global-dns/entries/new/controller.js index e4b697dee..d9fb1437d 100644 --- a/lib/global-admin/addon/global-dns/entries/new/controller.js +++ b/lib/global-admin/addon/global-dns/entries/new/controller.js @@ -26,6 +26,7 @@ export default Controller.extend(ViewNewEdit, { scope: service(), queryParams: ['id'], + memberAccessTypes: ['owner'], id: null, errros: null, diff --git a/lib/global-admin/addon/global-dns/entries/new/template.hbs b/lib/global-admin/addon/global-dns/entries/new/template.hbs index 4965cb5af..2b1fadd17 100644 --- a/lib/global-admin/addon/global-dns/entries/new/template.hbs +++ b/lib/global-admin/addon/global-dns/entries/new/template.hbs @@ -187,7 +187,7 @@ expand=(action expandFn) }} {{form-members-global-access - excludeMember=true + optionsForAccessType=memberAccessTypes readOnly=false resource=model.globaldns addAuthorizedPrincipal=(action "addAuthorizedPrincipal") diff --git a/lib/global-admin/addon/global-dns/providers/new/controller.js b/lib/global-admin/addon/global-dns/providers/new/controller.js index 87e3bb542..b895c1d6e 100644 --- a/lib/global-admin/addon/global-dns/providers/new/controller.js +++ b/lib/global-admin/addon/global-dns/providers/new/controller.js @@ -11,6 +11,7 @@ export default Controller.extend(ViewNewEdit, { globalStore: service(), queryParams: ['id', 'activeProvider'], + memberAccessTypes: ['owner', 'read-only'], id: null, activeProvider: 'route53', diff --git a/lib/global-admin/addon/global-dns/providers/new/template.hbs b/lib/global-admin/addon/global-dns/providers/new/template.hbs index 2b3db9c79..c69a815a7 100644 --- a/lib/global-admin/addon/global-dns/providers/new/template.hbs +++ b/lib/global-admin/addon/global-dns/providers/new/template.hbs @@ -54,7 +54,7 @@ expand=(action expandFn) }} {{form-members-global-access - excludeMember=true + optionsForAccessType=memberAccessTypes readOnly=false resource=model addAuthorizedPrincipal=(action "addAuthorizedPrincipal") diff --git a/lib/shared/addon/components/form-members-global-access/component.js b/lib/shared/addon/components/form-members-global-access/component.js index 80fb7389f..68eb9ccae 100644 --- a/lib/shared/addon/components/form-members-global-access/component.js +++ b/lib/shared/addon/components/form-members-global-access/component.js @@ -22,18 +22,18 @@ const MEMBERS_HEADERS = [ ]; export default Component.extend({ - globalStore: service(), + globalStore: service(), layout, - membersHeaders: MEMBERS_HEADERS, - sortBy: '', - descending: false, - excludeMember: false, - resource: null, - gotError: null, - removeMember: null, - optionsForAccessType: null, + membersHeaders: MEMBERS_HEADERS, + sortBy: '', + descending: false, + excludeMember: false, + resource: null, + gotError: null, + removeMember: null, + optionsForAccessType: null, init() { this._super(...arguments); @@ -69,13 +69,8 @@ export default Component.extend({ }, initOptionsForMembersAccessType() { - let accessTypes = this.globalStore.getById('schema', 'member').optionsFor('accessType') || []; + let accessTypes = this.optionsForAccessType || this.globalStore.getById('schema', 'member').optionsFor('accessType'); - if (this.excludeMember) { - accessTypes = accessTypes.without('member'); - } - set(this, 'optionsForAccessType', accessTypes); - - return; + return set(this, 'optionsForAccessType', accessTypes); }, }); diff --git a/lib/shared/addon/components/form-members-global-access/template.hbs b/lib/shared/addon/components/form-members-global-access/template.hbs index 657787904..3dda33a50 100644 --- a/lib/shared/addon/components/form-members-global-access/template.hbs +++ b/lib/shared/addon/components/form-members-global-access/template.hbs @@ -30,21 +30,25 @@ {{member.displayType}}